http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/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 7bc1939..f534411 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 @@ -69,7 +69,6 @@ import org.apache.ambari.server.orm.entities.BlueprintConfiguration; import org.apache.ambari.server.orm.entities.BlueprintEntity; import org.apache.ambari.server.orm.entities.BlueprintSettingEntity; import org.apache.ambari.server.orm.entities.HostGroupComponentEntity; -import org.apache.ambari.server.orm.entities.HostGroupConfigEntity; import org.apache.ambari.server.orm.entities.HostGroupEntity; import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.PropertyInfo; @@ -395,7 +394,7 @@ public class BlueprintResourceProviderTest { SecurityConfiguration securityConfiguration = new SecurityConfiguration(SecurityType.KERBEROS, "testRef", null); // set expectations - expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.anyObject(), anyBoolean())).andReturn (securityConfiguration).once(); expect(blueprintFactory.createBlueprint(setProperties.iterator().next(), securityConfiguration)).andReturn(blueprint).once(); blueprint.validateRequiredProperties(); @@ -459,7 +458,7 @@ public class BlueprintResourceProviderTest { NoSuchParentResourceException, NoSuchResourceException, AmbariException { StackInfo info = createMock(StackInfo.class); - expect(info.getConfigPropertiesTypes("core-site")).andReturn(new HashMap<PropertyInfo.PropertyType, Set<String>>()).anyTimes(); + expect(info.getConfigPropertiesTypes("core-site")).andReturn(new HashMap<>()).anyTimes(); expect(metaInfo.getStack("test-stack-name", "test-stack-version")).andReturn(info).anyTimes(); replay(info, metaInfo); Request request = createNiceMock(Request.class); @@ -855,7 +854,7 @@ public class BlueprintResourceProviderTest { hostGroups.add(hostGroup); hostGroup.setName((String) groupProperties.get(BlueprintResourceProvider.HOST_GROUP_NAME_PROPERTY_ID)); hostGroup.setCardinality((String) groupProperties.get(BlueprintResourceProvider.HOST_GROUP_CARDINALITY_PROPERTY_ID)); - hostGroup.setConfigurations(new ArrayList<HostGroupConfigEntity>()); + hostGroup.setConfigurations(new ArrayList<>()); Set<Map<String, String>> setComponentProperties = (Set<Map<String, String>>) groupProperties.get( BlueprintResourceProvider.COMPONENT_PROPERTY_ID); @@ -1056,8 +1055,8 @@ public class BlueprintResourceProviderTest { }}; StackInfo info = createMock(StackInfo.class); - expect(info.getConfigPropertiesTypes("type1")).andReturn(new HashMap<PropertyInfo.PropertyType, Set<String>>()).anyTimes(); - expect(info.getConfigPropertiesTypes("type2")).andReturn(new HashMap<PropertyInfo.PropertyType, Set<String>>()).anyTimes(); + expect(info.getConfigPropertiesTypes("type1")).andReturn(new HashMap<>()).anyTimes(); + expect(info.getConfigPropertiesTypes("type2")).andReturn(new HashMap<>()).anyTimes(); expect(info.getConfigPropertiesTypes("type3")).andReturn(pwdProperties).anyTimes(); expect(metaInfo.getStack("test-stack-name", "test-stack-version")).andReturn(info).anyTimes(); @@ -1157,8 +1156,8 @@ public class BlueprintResourceProviderTest { }}; StackInfo info = createMock(StackInfo.class); - expect(info.getConfigPropertiesTypes("type1")).andReturn(new HashMap<PropertyInfo.PropertyType, Set<String>>()).anyTimes(); - expect(info.getConfigPropertiesTypes("type2")).andReturn(new HashMap<PropertyInfo.PropertyType, Set<String>>()).anyTimes(); + expect(info.getConfigPropertiesTypes("type1")).andReturn(new HashMap<>()).anyTimes(); + expect(info.getConfigPropertiesTypes("type2")).andReturn(new HashMap<>()).anyTimes(); expect(info.getConfigPropertiesTypes("type3")).andReturn(pwdProperties).anyTimes(); expect(metaInfo.getStack("test-stack-name", "test-stack-version")).andReturn(info).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java index 3fc52d9..5c7814e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java @@ -675,19 +675,19 @@ public class CalculatedStatusTest { public void testGetCompletedStatusForNoTasks() throws Exception { // no status / no tasks CalculatedStatus status = CalculatedStatus.statusFromTaskEntities( - new ArrayList<HostRoleCommandEntity>(), false); + new ArrayList<>(), false); assertEquals(HostRoleStatus.COMPLETED, status.getStatus()); // empty summaries status = CalculatedStatus.statusFromStageSummary( - new HashMap<Long, HostRoleCommandStatusSummaryDTO>(), new HashSet<Long>()); + new HashMap<>(), new HashSet<>()); assertEquals(HostRoleStatus.COMPLETED, status.getStatus()); // generate a map of 0's - COMPLETED=0, IN_PROGRESS=0, etc - Map<HostRoleStatus, Integer> counts = CalculatedStatus.calculateStatusCounts(new ArrayList<HostRoleStatus>()); - Map<HostRoleStatus, Integer> displayCounts = CalculatedStatus.calculateStatusCounts(new ArrayList<HostRoleStatus>()); + Map<HostRoleStatus, Integer> counts = CalculatedStatus.calculateStatusCounts(new ArrayList<>()); + Map<HostRoleStatus, Integer> displayCounts = CalculatedStatus.calculateStatusCounts(new ArrayList<>()); HostRoleStatus hostRoleStatus = CalculatedStatus.calculateSummaryStatusOfUpgrade(counts, 0); HostRoleStatus hostRoleDisplayStatus = CalculatedStatus.calculateSummaryDisplayStatus(displayCounts, 0, false); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/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 3ccb375..833be5d 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 @@ -47,7 +47,6 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.RequestStatusResponse; -import org.apache.ambari.server.controller.ServiceComponentHostRequest; import org.apache.ambari.server.controller.ServiceComponentHostResponse; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; @@ -286,7 +285,7 @@ public class ClientConfigResourceProviderTest { expect(clusterConfig.getProperties()).andReturn(props); expect(configHelper.getEffectiveDesiredTags(cluster, null)).andReturn(allConfigTags); expect(cluster.getClusterName()).andReturn(clusterName); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(responses).anyTimes(); + expect(managementController.getHostComponents(EasyMock.anyObject())).andReturn(responses).anyTimes(); PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo"); Map<String, Set<String>> clusterHostInfo = new HashMap<>(); @@ -330,7 +329,7 @@ public class ClientConfigResourceProviderTest { rcaParams.put("key","value"); expect(managementController.getRcaParameters()).andReturn(rcaParams).anyTimes(); expect(ambariMetaInfo.getService(stackName, stackVersion, serviceName)).andReturn(serviceInfo); - expect(serviceInfo.getOsSpecifics()).andReturn(new HashMap<String, ServiceOsSpecific>()).anyTimes(); + expect(serviceInfo.getOsSpecifics()).andReturn(new HashMap<>()).anyTimes(); Set<String> userSet = new HashSet<>(); userSet.add("hdfs"); expect(configHelper.getPropertyValuesWithPropertyType( @@ -544,7 +543,7 @@ public class ClientConfigResourceProviderTest { expect(clusterConfig.getProperties()).andReturn(props); expect(configHelper.getEffectiveDesiredTags(cluster, null)).andReturn(allConfigTags); expect(cluster.getClusterName()).andReturn(clusterName); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(responses).anyTimes(); + expect(managementController.getHostComponents(EasyMock.anyObject())).andReturn(responses).anyTimes(); PowerMock.mockStaticPartial(StageUtils.class, "getClusterHostInfo"); Map<String, Set<String>> clusterHostInfo = new HashMap<>(); @@ -588,7 +587,7 @@ public class ClientConfigResourceProviderTest { rcaParams.put("key","value"); expect(managementController.getRcaParameters()).andReturn(rcaParams).anyTimes(); expect(ambariMetaInfo.getService(stackName, stackVersion, serviceName)).andReturn(serviceInfo); - expect(serviceInfo.getOsSpecifics()).andReturn(new HashMap<String, ServiceOsSpecific>()).anyTimes(); + expect(serviceInfo.getOsSpecifics()).andReturn(new HashMap<>()).anyTimes(); Set<String> userSet = new HashSet<>(); userSet.add("hdfs"); expect(configHelper.getPropertyValuesWithPropertyType(stackId, PropertyInfo.PropertyType.USER, cluster, desiredConfigMap)).andReturn(userSet); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/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 5f9157a..7cbb4b7 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 @@ -887,22 +887,22 @@ public class ClusterControllerImplTest { expect( resourceProvider.checkPropertyIds(Collections.singleton(AlertHistoryResourceProvider.ALERT_HISTORY_HOSTNAME))).andReturn( - Collections.<String> emptySet()).anyTimes(); + Collections.emptySet()).anyTimes(); expect( resourceProvider.getResources(anyObject(Request.class), anyObject(Predicate.class))).andReturn( - Collections.<Resource> emptySet()).anyTimes(); + Collections.emptySet()).anyTimes(); - expect(resourceProvider.checkPropertyIds(EasyMock.<Set<String>>anyObject())).andReturn( - new HashSet<String>()).anyTimes(); + expect(resourceProvider.checkPropertyIds(EasyMock.anyObject())).andReturn( + new HashSet<>()).anyTimes(); // strict pageRequest mock to ensure that paging is not performed on // the result set PageRequest pageRequest = EasyMock.createStrictMock(PageRequest.class); SortRequest sortRequest = EasyMock.createStrictMock(SortRequest.class); - expect(sortRequest.getPropertyIds()).andReturn(new ArrayList<String>()).atLeastOnce(); + expect(sortRequest.getPropertyIds()).andReturn(new ArrayList<>()).atLeastOnce(); replay(providerModule, resourceProvider, pageRequest, sortRequest); @@ -1038,7 +1038,7 @@ public class ClusterControllerImplTest { resource.setProperty(PropertyHelper.getPropertyId("Clusters", "cluster_name"), "cluster"); - return Collections.<Resource>singleton(resource); + return Collections.singleton(resource); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java index e0335e6..f6fc59d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java @@ -371,7 +371,7 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo Request request = createMock(Request.class); expect(request.getPropertyIds()).andReturn(null).atLeastOnce(); - expect(request.getRequestInfoProperties()).andReturn(Collections.<String, String>emptyMap()).atLeastOnce(); + expect(request.getRequestInfoProperties()).andReturn(Collections.emptyMap()).atLeastOnce(); replayAll(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/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 1f10a85..4a80893 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(EasyMock.<Map<String, Object>>anyObject(), 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(EasyMock.<Map<String, Object>>anyObject(), 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(EasyMock.<Map<String, Object>>anyObject(), anyBoolean())).andReturn + expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.anyObject(), anyBoolean())).andReturn (securityConfiguration).once(); expect(topologyManager.provisionCluster(topologyRequest)).andReturn(requestStatusResponse).once(); expect(requestStatusResponse.getRequestId()).andReturn(5150L).anyTimes(); @@ -501,7 +501,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), 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(); @@ -600,7 +600,7 @@ public class ClusterResourceProviderTest { mapRequestProps.put("context", "Called from a test"); // set expectations - expect(managementController.getClusters(EasyMock.<Set<ClusterRequest>>anyObject())).andReturn(nameResponse).once(); + expect(managementController.getClusters(EasyMock.anyObject())).andReturn(nameResponse).once(); expect(managementController.updateClusters( AbstractResourceProviderTest.Matcher.getClusterRequestSet(102L, "Cluster102", State.INSTALLED.name(), SecurityType.NONE, "HDP-0.1", null), eq(mapRequestProps))). andReturn(response).once(); @@ -668,7 +668,7 @@ public class ClusterResourceProviderTest { mapRequestProps.put("context", "Called from a test"); // set expectations - expect(managementController.getClusters(EasyMock.<Set<ClusterRequest>>anyObject())).andReturn(nameResponse).times(2); + expect(managementController.getClusters(EasyMock.anyObject())).andReturn(nameResponse).times(2); expect(managementController.updateClusters(Collections.singleton(EasyMock.anyObject(ClusterRequest.class)), eq(mapRequestProps))).andReturn(response).times(1); expect(managementController.getClusterUpdateResults(anyObject(ClusterRequest.class))).andReturn(null).anyTimes(); @@ -842,7 +842,7 @@ public class ClusterResourceProviderTest { expect(request.getProperties()).andReturn(requestProperties).anyTimes(); expect(request.getRequestInfoProperties()).andReturn(requestInfoProperties).anyTimes(); - expect(securityFactory.createSecurityConfigurationFromRequest(EasyMock.<Map<String, Object>>anyObject(), 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/ab8d58ba/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 7d67726..fb45afb 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 @@ -50,8 +50,7 @@ import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.Role; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; -import org.apache.ambari.server.actionmanager.HostRoleCommand; -import org.apache.ambari.server.actionmanager.Stage; + import org.apache.ambari.server.actionmanager.Stage; import org.apache.ambari.server.actionmanager.StageFactory; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.agent.ExecutionCommand.KeyNames; @@ -86,7 +85,6 @@ import org.apache.ambari.server.state.MaintenanceState; import org.apache.ambari.server.state.RepositoryType; import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Service; -import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.ServiceOsSpecific; @@ -225,7 +223,7 @@ public class ClusterStackVersionResourceProviderTest { expect(host.getMaintenanceState(EasyMock.anyLong())).andReturn( MaintenanceState.OFF).anyTimes(); expect(host.getAllHostVersions()).andReturn( - Collections.<HostVersionEntity>emptyList()).anyTimes(); + Collections.emptyList()).anyTimes(); replay(host); hostsForCluster.put(hostname, host); @@ -277,11 +275,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), 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(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -291,7 +289,7 @@ public class ClusterStackVersionResourceProviderTest { String clusterName = "Cluster100"; expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); - expect(cluster.getServices()).andReturn(new HashMap<String, Service>()).anyTimes(); + expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andAnswer(new IAnswer<List<ServiceComponentHost>>() { @Override @@ -335,7 +333,7 @@ public class ClusterStackVersionResourceProviderTest { anyObject(StackId.class), anyObject(String.class))).andReturn(repoVersion); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); ClusterEntity clusterEntity = new ClusterEntity(); clusterEntity.setClusterId(1l); @@ -417,7 +415,7 @@ public class ClusterStackVersionResourceProviderTest { expect(host.getMaintenanceState(EasyMock.anyLong())).andReturn( MaintenanceState.OFF).anyTimes(); expect(host.getAllHostVersions()).andReturn( - Collections.<HostVersionEntity>emptyList()).anyTimes(); + Collections.emptyList()).anyTimes(); replay(host); hostsForCluster.put(hostname, host); @@ -428,8 +426,8 @@ public class ClusterStackVersionResourceProviderTest { expect(hdfsService.getName()).andReturn("HDFS").anyTimes(); expect(hbaseService.getName()).andReturn("HBASE").anyTimes(); - expect(hdfsService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); - expect(hbaseService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(hdfsService.getServiceComponents()).andReturn(new HashMap<>()); + expect(hbaseService.getServiceComponents()).andReturn(new HashMap<>()); Map<String, Service> serviceMap = new HashMap<>(); serviceMap.put("HDFS", hdfsService); @@ -482,10 +480,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))). + EasyMock.anyObject(), anyObject(String.class))). andReturn(packages).times(1); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -540,7 +538,7 @@ public class ClusterStackVersionResourceProviderTest { actionManager.sendActions(capture(c), capture(ear)); expectLastCall().atLeastOnce(); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); ClusterEntity clusterEntity = new ClusterEntity(); clusterEntity.setClusterId(1l); @@ -640,7 +638,7 @@ public class ClusterStackVersionResourceProviderTest { expect(host.getMaintenanceState(EasyMock.anyLong())).andReturn( MaintenanceState.OFF).anyTimes(); expect(host.getAllHostVersions()).andReturn( - Collections.<HostVersionEntity>emptyList()).anyTimes(); + Collections.emptyList()).anyTimes(); replay(host); hostsForCluster.put(hostname, host); @@ -656,8 +654,8 @@ public class ClusterStackVersionResourceProviderTest { expect(hdfsService.getName()).andReturn("HDFS").anyTimes(); expect(hbaseService.getName()).andReturn("HBASE").anyTimes(); - expect(hdfsService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); - expect(hbaseService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(hdfsService.getServiceComponents()).andReturn(new HashMap<>()); + expect(hbaseService.getServiceComponents()).andReturn(new HashMap<>()); Map<String, Service> serviceMap = new HashMap<>(); serviceMap.put("HDFS", hdfsService); @@ -706,10 +704,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))). + EasyMock.anyObject(), anyObject(String.class))). andReturn(packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -769,7 +767,7 @@ public class ClusterStackVersionResourceProviderTest { actionManager.sendActions(capture(c), capture(ear)); expectLastCall().atLeastOnce(); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); ClusterEntity clusterEntity = new ClusterEntity(); clusterEntity.setClusterId(1l); @@ -882,7 +880,7 @@ public class ClusterStackVersionResourceProviderTest { expect(host.getMaintenanceState(EasyMock.anyLong())).andReturn( MaintenanceState.OFF).anyTimes(); expect(host.getAllHostVersions()).andReturn( - Collections.<HostVersionEntity>emptyList()).anyTimes(); + Collections.emptyList()).anyTimes(); replay(host); hostsForCluster.put(hostname, host); @@ -897,8 +895,8 @@ public class ClusterStackVersionResourceProviderTest { expect(hdfsService.getName()).andReturn("HDFS").anyTimes(); expect(hbaseService.getName()).andReturn("HBASE").anyTimes(); - expect(hdfsService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); - expect(hbaseService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(hdfsService.getServiceComponents()).andReturn(new HashMap<>()); + expect(hbaseService.getServiceComponents()).andReturn(new HashMap<>()); Map<String, Service> serviceMap = new HashMap<>(); serviceMap.put("HDFS", hdfsService); @@ -947,10 +945,10 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))). + EasyMock.anyObject(), anyObject(String.class))). andReturn(packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -1008,7 +1006,7 @@ public class ClusterStackVersionResourceProviderTest { actionManager.sendActions(capture(c), capture(ear)); expectLastCall().atLeastOnce(); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); ClusterEntity clusterEntity = new ClusterEntity(); clusterEntity.setClusterId(1l); @@ -1178,11 +1176,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), 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(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); @@ -1192,7 +1190,7 @@ public class ClusterStackVersionResourceProviderTest { String clusterName = "Cluster100"; expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); - expect(cluster.getServices()).andReturn(new HashMap<String, Service>()).anyTimes(); + expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andAnswer(new IAnswer<List<ServiceComponentHost>>() { @Override @@ -1209,7 +1207,7 @@ public class ClusterStackVersionResourceProviderTest { // now the important expectations - that the cluster transition methods were // called correctly expect(cluster.transitionHostsToInstalling(anyObject(RepositoryVersionEntity.class), - anyObject(VersionDefinitionXml.class), eq(false))).andReturn(Collections.<Host>emptyList()).anyTimes(); + anyObject(VersionDefinitionXml.class), eq(false))).andReturn(Collections.emptyList()).anyTimes(); ExecutionCommand executionCommand = createNiceMock(ExecutionCommand.class); @@ -1236,7 +1234,7 @@ public class ClusterStackVersionResourceProviderTest { expect(repositoryVersionDAOMock.findByStackAndVersion(anyObject(StackId.class), anyObject(String.class))).andReturn(repoVersion); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); ClusterEntity clusterEntity = new ClusterEntity(); clusterEntity.setClusterId(1l); @@ -1351,7 +1349,7 @@ public class ClusterStackVersionResourceProviderTest { if (i < hostCount - 2) { expect(host.hasComponentsAdvertisingVersions(eq(stackId))).andReturn(true).atLeastOnce(); hostsNeedingInstallCommands.add(host); - expect(host.getAllHostVersions()).andReturn(Collections.<HostVersionEntity>emptyList()).anyTimes(); + expect(host.getAllHostVersions()).andReturn(Collections.emptyList()).anyTimes(); } else { expect(host.hasComponentsAdvertisingVersions(eq(stackId))).andReturn(false).atLeastOnce(); @@ -1372,7 +1370,7 @@ public class ClusterStackVersionResourceProviderTest { Service hdfsService = createNiceMock(Service.class); expect(hdfsService.getName()).andReturn("HDFS").anyTimes(); - expect(hdfsService.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(hdfsService.getServiceComponents()).andReturn(new HashMap<>()); Map<String, Service> serviceMap = new HashMap<>(); serviceMap.put("HDFS", hdfsService); @@ -1400,11 +1398,11 @@ public class ClusterStackVersionResourceProviderTest { expect(managementController.getAuthName()).andReturn("admin").anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn( + EasyMock.anyObject(), anyObject(String.class))).andReturn( packages).anyTimes(); // only one host has the versionable component - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), 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/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java index 6f6839f..80cd1da 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java @@ -388,7 +388,7 @@ public class ComponentResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); expect(managementController.getEffectiveMaintenanceState( - capture(EasyMock.<ServiceComponentHost>newCapture()))).andReturn(MaintenanceState.OFF).anyTimes(); + capture(EasyMock.newCapture()))).andReturn(MaintenanceState.OFF).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -701,7 +701,7 @@ public class ComponentResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); expect(managementController.getEffectiveMaintenanceState( - capture(EasyMock.<ServiceComponentHost>newCapture()))).andReturn(MaintenanceState.OFF).anyTimes(); + capture(EasyMock.newCapture()))).andReturn(MaintenanceState.OFF).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/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 6dd0748..78f79ea 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 @@ -284,8 +284,8 @@ public class ConfigGroupResourceProviderTest { expect(cluster.getConfigGroups()).andReturn(configGroupMap); expect(configGroupFactory.createNew((Cluster) anyObject(), (String) anyObject(), (String) anyObject(), - (String) anyObject(), (String) anyObject(), EasyMock.<Map<String, Config>>anyObject(), - EasyMock.<Map<Long, Host>>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(); @@ -496,7 +496,7 @@ public class ConfigGroupResourceProviderTest { expect(h1.getHostId()).andReturn(1L).anyTimes(); expect(h2.getHostId()).andReturn(2L).anyTimes(); expect(managementController.getConfigGroupUpdateResults((ConfigGroupRequest)anyObject())). - andReturn(new ConfigGroupResponse(1L, "", "", "", "", new HashSet<Map<String, Object>>(), new HashSet<Map<String, Object>>())).atLeastOnce(); + andReturn(new ConfigGroupResponse(1L, "", "", "", "", new HashSet<>(), new HashSet<>())).atLeastOnce(); expect(configGroup.getName()).andReturn("test-1").anyTimes(); expect(configGroup.getId()).andReturn(25L).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java index b56522e..785ea23 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java @@ -73,7 +73,7 @@ public class ConfigurationResourceProviderTest { RequestStatusResponse response = createNiceMock(RequestStatusResponse.class); managementController.createConfiguration(AbstractResourceProviderTest.Matcher.getConfigurationRequest( - "Cluster100", "type", "tag", new HashMap<String, String>(), null)); + "Cluster100", "type", "tag", new HashMap<>(), null)); expectLastCall().andReturn(null); // replay http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java index 4c598ca..e1f5583 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequestTest.java @@ -40,10 +40,8 @@ import java.util.Set; import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.api.util.TreeNodeImpl; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.StackConfigurationResponse; import org.apache.ambari.server.controller.StackLevelConfigurationRequest; import org.apache.ambari.server.controller.StackServiceRequest; -import org.apache.ambari.server.controller.StackServiceResponse; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.topology.Blueprint; import org.apache.ambari.server.topology.HostGroup; @@ -69,9 +67,9 @@ public class ExportBlueprintRequestTest { f.set(null, controller); expect(controller.getStackServices((Set<StackServiceRequest>) anyObject())).andReturn( - Collections.<StackServiceResponse>emptySet()).anyTimes(); + Collections.emptySet()).anyTimes(); expect(controller.getStackLevelConfigurations((Set<StackLevelConfigurationRequest>) anyObject())).andReturn( - Collections.<StackConfigurationResponse>emptySet()).anyTimes(); + Collections.emptySet()).anyTimes(); replay(controller); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java index dc7e1d6..5b6e830 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ExtensionResourceProviderTest.java @@ -27,7 +27,6 @@ import java.util.HashSet; import java.util.Set; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.ExtensionRequest; import org.apache.ambari.server.controller.ExtensionResponse; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; @@ -52,7 +51,7 @@ public class ExtensionResourceProviderTest { allResponse.add(new ExtensionResponse("Extension2")); // set expectations - expect(managementController.getExtensions(EasyMock.<Set<ExtensionRequest>>anyObject())).andReturn(allResponse).once(); + expect(managementController.getExtensions(EasyMock.anyObject())).andReturn(allResponse).once(); // replay replay(managementController); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java index 6841bf1..5cf9b05 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java @@ -69,7 +69,7 @@ public class FeedResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); FeedResourceProvider provider = new FeedResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRFeed), @@ -112,7 +112,7 @@ public class FeedResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); FeedResourceProvider provider = new FeedResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRFeed), @@ -160,7 +160,7 @@ public class FeedResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); FeedResourceProvider provider = new FeedResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRFeed), http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java index ad9c945..5a7460d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProviderTest.java @@ -67,7 +67,7 @@ public class HostComponentProcessResourceProviderTest { Predicate predicate = pb.property( HostComponentProcessResourceProvider.HC_PROCESS_COMPONENT_NAME_ID).equals("comp1").toPredicate(); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resources = provider.getResources(request, predicate); @@ -93,7 +93,7 @@ public class HostComponentProcessResourceProviderTest { Predicate predicate = pb.property( HostComponentProcessResourceProvider.HC_PROCESS_COMPONENT_NAME_ID).equals("comp1").toPredicate(); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resources = provider.getResources(request, predicate); @@ -125,7 +125,7 @@ public class HostComponentProcessResourceProviderTest { Predicate predicate = pb.property( HostComponentProcessResourceProvider.HC_PROCESS_COMPONENT_NAME_ID).equals("comp1").toPredicate(); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> resources = provider.getResources(request, predicate); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java index f6d9179..7e32c15 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java @@ -50,7 +50,6 @@ import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.RequestStatus; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.Resource.Type; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.controller.utilities.PredicateBuilder; import org.apache.ambari.server.controller.utilities.PropertyHelper; @@ -116,8 +115,8 @@ public class HostComponentResourceProviderTest { AbstractResourceProviderTest.Matcher.getHostComponentRequestSet( "Cluster100", "Service100", "Component100", "Host100", null, null)); - expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Type,String>>anyObject(), + expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))). andReturn(hostComponentResourceProvider).anyTimes(); @@ -219,8 +218,8 @@ public class HostComponentResourceProviderTest { // set expectations - expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Type,String>>anyObject(), + expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))). andReturn(hostComponentResourceProvider).anyTimes(); @@ -374,7 +373,7 @@ public class HostComponentResourceProviderTest { expect(maintenanceStateHelper.isOperationAllowed(Resource.Type.Cluster, componentHost)).andReturn(true).anyTimes(); expect(managementController.getHostComponents( - EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(nameResponse).once(); + EasyMock.anyObject())).andReturn(nameResponse).once(); Map<String, Map<State, List<ServiceComponentHost>>> changedHosts = new HashMap<>(); List<ServiceComponentHost> changedComponentHosts = new ArrayList<>(); @@ -382,7 +381,7 @@ public class HostComponentResourceProviderTest { changedHosts.put("Component100", Collections.singletonMap(State.STARTED, changedComponentHosts)); expect(managementController.addStages(null, cluster, mapRequestProps, null, null, null, changedHosts, - Collections.<ServiceComponentHost>emptyList(), false, false)).andReturn(stageContainer).once(); + Collections.emptyList(), false, false)).andReturn(stageContainer).once(); stageContainer.persist(); expect(stageContainer.getRequestStatusResponse()).andReturn(response).once(); @@ -394,8 +393,8 @@ public class HostComponentResourceProviderTest { provider.setFieldValue("maintenanceStateHelper", maintenanceStateHelper); provider.setFieldValue("hostVersionDAO", hostVersionDAO); - expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Type,String>>anyObject(), + expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))). andReturn(provider).anyTimes(); @@ -574,7 +573,7 @@ public class HostComponentResourceProviderTest { expect(maintenanceStateHelper.isOperationAllowed(Resource.Type.Cluster, componentHost)).andReturn(true).anyTimes(); expect(managementController.getHostComponents( - EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(Collections.<ServiceComponentHostResponse>emptySet()).once(); + EasyMock.anyObject())).andReturn(Collections.emptySet()).once(); Map<String, Map<State, List<ServiceComponentHost>>> changedHosts = new HashMap<>(); List<ServiceComponentHost> changedComponentHosts = new ArrayList<>(); @@ -588,8 +587,8 @@ public class HostComponentResourceProviderTest { provider.setFieldValue("maintenanceStateHelper", maintenanceStateHelper); provider.setFieldValue("hostVersionDAO", hostVersionDAO); - expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Type,String>>anyObject(), + expect(resourceProviderFactory.getHostComponentResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))). andReturn(provider).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java index c6fdd28..fd28081 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java @@ -54,7 +54,6 @@ import org.apache.ambari.server.controller.HostResponse; import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.controller.MaintenanceStateHelper; import org.apache.ambari.server.controller.ResourceProviderFactory; -import org.apache.ambari.server.controller.ServiceComponentHostRequest; import org.apache.ambari.server.controller.ServiceComponentHostResponse; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; @@ -77,9 +76,7 @@ import org.apache.ambari.server.state.HostHealthStatus; import org.apache.ambari.server.state.HostHealthStatus.HealthStatus; import org.apache.ambari.server.state.HostState; import org.apache.ambari.server.state.MaintenanceState; -import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.stack.OsFamily; -import org.apache.ambari.server.topology.LogicalRequest; import org.apache.ambari.server.topology.TopologyManager; import org.easymock.Capture; import org.easymock.EasyMock; @@ -141,11 +138,11 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(cluster.getClusterId()).andReturn(2L).anyTimes(); expect(cluster.getResourceId()).andReturn(4L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).atLeastOnce(); expect(clusters.getHost("Host100")).andReturn(host).atLeastOnce(); - clusters.updateHostWithClusterAndAttributes(EasyMock.<Map<String, Set<String>>>anyObject(), EasyMock.<Map<String, Map<String, String>>>anyObject()); + clusters.updateHostWithClusterAndAttributes(EasyMock.anyObject(), EasyMock.anyObject()); EasyMock.expectLastCall().once(); @@ -156,8 +153,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).atLeastOnce(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); // replay @@ -245,10 +242,10 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) - .andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(managementController.getHostComponents(EasyMock.anyObject())) + .andReturn(Collections.emptySet()).anyTimes(); + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))). andReturn(hostResourceProvider).anyTimes(); @@ -259,7 +256,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getClustersForHost("Host102")).andReturn(clusterSet).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes(); expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes(); @@ -340,7 +337,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) + expect(managementController.getHostComponents(EasyMock.anyObject())) .andReturn(responses).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -348,7 +345,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); @@ -361,8 +358,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); Set<String> propertyIds = new HashSet<>(); @@ -436,7 +433,7 @@ public class HostResourceProviderTest extends EasyMockSupport { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) + expect(managementController.getHostComponents(EasyMock.anyObject())) .andReturn(responses).anyTimes(); expect(host100.getMaintenanceState(2)).andReturn(MaintenanceState.OFF).anyTimes(); @@ -446,7 +443,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes(); expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes(); @@ -456,8 +453,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); Set<String> propertyIds = new HashSet<>(); @@ -533,7 +530,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) + expect(managementController.getHostComponents(EasyMock.anyObject())) .andReturn(responses).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -541,7 +538,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); @@ -553,8 +550,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); Set<String> propertyIds = new HashSet<>(); @@ -621,14 +618,14 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); expect(hostResponse1.getStatus()).andReturn(HealthStatus.UNKNOWN.name()).anyTimes(); expect(hostResponse1.getHealthReport()).andReturn("UNKNOWN").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); Set<String> propertyIds = new HashSet<>(); @@ -720,19 +717,19 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) + expect(managementController.getHostComponents(EasyMock.anyObject())) .andReturn(responses).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(clusters.getClustersForHost("Host100")).andReturn(clusterSet).anyTimes(); expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(), (String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes(); expect(componentInfo.getCategory()).andReturn("SLAVE").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); @@ -813,13 +810,13 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) + expect(managementController.getHostComponents(EasyMock.anyObject())) .andReturn(responses).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(clusters.getClustersForHost("Host100")).andReturn(clusterSet).anyTimes(); expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); expect(hostResponse1.getStatus()).andReturn(HealthStatus.ALERT.name()).anyTimes(); @@ -827,8 +824,8 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(), (String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes(); expect(componentInfo.getCategory()).andReturn("SLAVE").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); @@ -908,8 +905,8 @@ public class HostResourceProviderTest extends EasyMockSupport { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) - .andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); + expect(managementController.getHostComponents(EasyMock.anyObject())) + .andReturn(Collections.emptySet()).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(clusters.getClustersForHost("Host100")).andReturn(clusterSet).anyTimes(); expect(clusters.getHosts()).andReturn(Arrays.asList(host100)).anyTimes(); @@ -919,12 +916,12 @@ public class HostResourceProviderTest extends EasyMockSupport { expectLastCall().anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); expect(cluster.getResourceId()).andReturn(4L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); // replay @@ -995,8 +992,8 @@ public class HostResourceProviderTest extends EasyMockSupport { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())) - .andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); + expect(managementController.getHostComponents(EasyMock.anyObject())) + .andReturn(Collections.emptySet()).anyTimes(); managementController.registerRackChange("Cluster100"); expectLastCall().anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -1007,12 +1004,12 @@ public class HostResourceProviderTest extends EasyMockSupport { expectLastCall().anyTimes(); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); expect(cluster.getResourceId()).andReturn(4L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes(); expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes(); expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), - EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), + EasyMock.anyObject(), eq(managementController))).andReturn(hostResourceProvider).anyTimes(); // replay @@ -1076,15 +1073,15 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHost("Host100")).andReturn(host1).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); expect(clusters.getClustersForHost("Host100")).andReturn(clusterSet).anyTimes(); - expect(cluster.getServiceComponentHosts("Host100")).andReturn(Collections.<ServiceComponentHost>emptyList()); + expect(cluster.getServiceComponentHosts("Host100")).andReturn(Collections.emptyList()); expect(cluster.getClusterId()).andReturn(100L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); clusters.deleteHost("Host100"); clusters.publishHostsDeletion(Collections.EMPTY_SET, Collections.singleton("Host100")); expect(host1.getHostName()).andReturn("Host100").anyTimes(); expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes(); expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes(); - expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes(); + expect(topologyManager.getRequests(Collections.emptyList())).andReturn(Collections.emptyList()).anyTimes(); // replay replayAll(); @@ -1233,10 +1230,10 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(clusters.getCluster("cluster1")).andReturn(cluster); expect(clusters.getHost("host1")).andReturn(host); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); expect(host.getHostName()).andReturn("host1").anyTimes(); // because cluster is not in set will result in HostNotFoundException - expect(clusters.getClustersForHost("host1")).andReturn(Collections.<Cluster>emptySet()); + expect(clusters.getClustersForHost("host1")).andReturn(Collections.emptySet()); // replay mocks replayAll(); @@ -1299,7 +1296,7 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(clusters.getHost("host4")).andThrow(new HostNotFoundException("host4")); expect(cluster.getClusterId()).andReturn(2L).anyTimes(); - expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes(); + expect(cluster.getDesiredConfigs()).andReturn(new HashMap<>()).anyTimes(); // replay mocks replayAll(); @@ -1331,7 +1328,7 @@ public class HostResourceProviderTest extends EasyMockSupport { properties.add(requestProperties); } - provider.createHosts(PropertyHelper.getCreateRequest(properties, Collections.<String, String>emptyMap())); + provider.createHosts(PropertyHelper.getCreateRequest(properties, Collections.emptyMap())); } public static Set<HostResponse> getHosts(AmbariManagementController controller, @@ -1343,7 +1340,7 @@ public class HostResourceProviderTest extends EasyMockSupport { public static void deleteHosts(AmbariManagementController controller, Set<HostRequest> requests) throws AmbariException { TopologyManager topologyManager = EasyMock.createNiceMock(TopologyManager.class); - expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes(); + expect(topologyManager.getRequests(Collections.emptyList())).andReturn(Collections.emptyList()).anyTimes(); replay(topologyManager); @@ -1356,7 +1353,7 @@ public class HostResourceProviderTest extends EasyMockSupport { Set<HostRequest> requests, boolean dryRun, boolean forceDelete) throws AmbariException { TopologyManager topologyManager = EasyMock.createNiceMock(TopologyManager.class); - expect(topologyManager.getRequests(Collections.<Long>emptyList())).andReturn(Collections.<LogicalRequest>emptyList()).anyTimes(); + expect(topologyManager.getRequests(Collections.emptyList())).andReturn(Collections.emptyList()).anyTimes(); replay(topologyManager); @@ -1423,15 +1420,15 @@ public class HostResourceProviderTest extends EasyMockSupport { expect(host.convertToResponse()).andReturn(hostResponse).anyTimes(); try { - expect(host.getDesiredHostConfigs(EasyMock.<Cluster> anyObject(), - EasyMock.<Map<String, DesiredConfig>> anyObject())).andReturn(desiredConfigs).anyTimes(); + expect(host.getDesiredHostConfigs(EasyMock.anyObject(), + EasyMock.anyObject())).andReturn(desiredConfigs).anyTimes(); } catch (AmbariException e) { Assert.fail(e.getMessage()); } expect(host.getHostName()).andReturn(hostName).anyTimes(); expect(host.getRackInfo()).andReturn("rackInfo").anyTimes(); - host.setRackInfo(EasyMock.<String>anyObject()); + host.setRackInfo(EasyMock.anyObject()); expectLastCall().anyTimes(); return host; } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java index 26b89d3..6c95c53 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java @@ -45,7 +45,6 @@ import java.util.Set; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.actionmanager.ActionManager; -import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -70,7 +69,6 @@ import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.RepositoryVersionState; -import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.ServiceOsSpecific; @@ -184,7 +182,7 @@ public class HostStackVersionResourceProviderTest { .property(HostStackVersionResourceProvider.HOST_STACK_VERSION_STATE_PROPERTY_ID).equals("OUT_OF_SYNC") .end().toPredicate(); // create the request - Request request = PropertyHelper.getCreateRequest(Collections.<Map<String,Object>>emptySet(), null); + Request request = PropertyHelper.getCreateRequest(Collections.emptySet(), null); ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( type, PropertyHelper.getPropertyIds(type), @@ -234,15 +232,15 @@ public class HostStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); + EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); expect(clusters.getHost(anyObject(String.class))).andReturn(host1); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); - expect(cluster.getServices()).andReturn(new HashMap<String, Service>()).anyTimes(); + expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes(); @@ -261,7 +259,7 @@ public class HostStackVersionResourceProviderTest { expect(hostVersionEntityMock.getState()).andReturn(RepositoryVersionState.INSTALL_FAILED).anyTimes(); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class)); StageUtils.setConfiguration(injector.getInstance(Configuration.class)); @@ -338,7 +336,7 @@ public class HostStackVersionResourceProviderTest { expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); expect(clusters.getHost(anyObject(String.class))).andReturn(host1); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); - expect(cluster.getServices()).andReturn(new HashMap<String, Service>()).anyTimes(); + expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect( @@ -346,7 +344,7 @@ public class HostStackVersionResourceProviderTest { anyObject(StackId.class), anyObject(String.class))).andReturn(repoVersion); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); requestCapture = newCapture(); executeActionRequestCapture = newCapture(); actionManager.sendActions(capture(requestCapture), capture(executeActionRequestCapture)); @@ -428,15 +426,15 @@ public class HostStackVersionResourceProviderTest { expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), - EasyMock.<Map<String, String>>anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); + EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); - expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), + expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))).andReturn(csvResourceProvider).anyTimes(); expect(clusters.getCluster(anyObject(String.class))).andReturn(cluster); expect(clusters.getHost(anyObject(String.class))).andReturn(host1); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); - expect(cluster.getServices()).andReturn(new HashMap<String, Service>()).anyTimes(); + expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes(); @@ -455,7 +453,7 @@ public class HostStackVersionResourceProviderTest { expect(hostVersionEntityMock.getState()).andReturn(RepositoryVersionState.OUT_OF_SYNC).anyTimes(); - expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.<HostRoleCommand>emptyList()).anyTimes(); + expect(actionManager.getRequestTasks(anyLong())).andReturn(Collections.emptyList()).anyTimes(); StageUtils.setTopologyManager(injector.getInstance(TopologyManager.class)); StageUtils.setConfiguration(injector.getInstance(Configuration.class));
