http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java index 7c8a6b1..7eb0a13 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java @@ -54,10 +54,10 @@ public class HttpPropertyProviderTest { static { HTTP_PROPERTY_REQUESTS.put("RESOURCEMANAGER", - Collections.<HttpPropertyProvider.HttpPropertyRequest>singletonList(new ResourceManagerHttpPropertyRequest())); + Collections.singletonList(new ResourceManagerHttpPropertyRequest())); HTTP_PROPERTY_REQUESTS.put("ATLAS_SERVER", - Collections.<HttpPropertyProvider.HttpPropertyRequest>singletonList(new AtlasServerHttpPropertyRequest())); + Collections.singletonList(new AtlasServerHttpPropertyRequest())); } @Test @@ -78,7 +78,7 @@ public class HttpPropertyProviderTest { expect(cluster.getDesiredConfigByType("yarn-site")).andReturn(config1).anyTimes(); expect(cluster.getDesiredConfigByType("core-site")).andReturn(config2).anyTimes(); expect(config1.getProperties()).andReturn(map).anyTimes(); - expect(config2.getProperties()).andReturn(new HashMap<String, String>()).anyTimes(); + expect(config2.getProperties()).andReturn(new HashMap<>()).anyTimes(); replay(clusters, cluster, config1, config2); @@ -97,7 +97,7 @@ public class HttpPropertyProviderTest { resource.setProperty(PROPERTY_ID_CLUSTER_NAME, "testCluster"); resource.setProperty(PROPERTY_ID_COMPONENT_NAME, "RESOURCEMANAGER"); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); propProvider.populateResources(Collections.singleton(resource), request, null); @@ -129,7 +129,7 @@ public class HttpPropertyProviderTest { expect(cluster.getDesiredConfigByType("yarn-site")).andReturn(config1).anyTimes(); expect(cluster.getDesiredConfigByType("core-site")).andReturn(config2).anyTimes(); expect(config1.getProperties()).andReturn(map).anyTimes(); - expect(config2.getProperties()).andReturn(new HashMap<String, String>()).anyTimes(); + expect(config2.getProperties()).andReturn(new HashMap<>()).anyTimes(); replay(clusters, cluster, config1, config2); @@ -148,7 +148,7 @@ public class HttpPropertyProviderTest { resource.setProperty(PROPERTY_ID_CLUSTER_NAME, "testCluster"); resource.setProperty(PROPERTY_ID_COMPONENT_NAME, "RESOURCEMANAGER"); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); propProvider.populateResources(Collections.singleton(resource), request, null); @@ -190,7 +190,7 @@ public class HttpPropertyProviderTest { resource.setProperty(PROPERTY_ID_PUBLIC_HOST_NAME, "ec2-54-234-33-50.compute-1.amazonaws.com"); resource.setProperty(PROPERTY_ID_COMPONENT_NAME, "ATLAS_SERVER"); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); propProvider.populateResources(Collections.singleton(resource), request, null); @@ -232,7 +232,7 @@ public class HttpPropertyProviderTest { resource.setProperty(PROPERTY_ID_PUBLIC_HOST_NAME, "ec2-54-234-33-50.compute-1.amazonaws.com"); resource.setProperty(PROPERTY_ID_COMPONENT_NAME, "ATLAS_SERVER"); - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); propProvider.populateResources(Collections.singleton(resource), request, null); @@ -244,7 +244,7 @@ public class HttpPropertyProviderTest { @Test public void testReadGangliaServer() throws Exception { Resource resource = doPopulate("GANGLIA_SERVER", - Collections.<String> emptySet(), new TestStreamProvider(false)); + Collections.emptySet(), new TestStreamProvider(false)); // !!! GANGLIA_SERVER has no current http lookup Assert.assertNull(resource.getPropertyValue(PROPERTY_ID_STALE_CONFIGS));
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java index 959555f..ba67939 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java @@ -59,7 +59,7 @@ public class InstanceResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); InstanceResourceProvider provider = new InstanceResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRInstance), @@ -104,7 +104,7 @@ public class InstanceResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); InstanceResourceProvider provider = new InstanceResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRInstance), @@ -145,7 +145,7 @@ public class InstanceResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); InstanceResourceProvider provider = new InstanceResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRInstance), http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java index f118bd4..e19ad29 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java @@ -219,7 +219,7 @@ public class JMXHostProviderTest { "hdfs-site", "version1", configs, null); ClusterRequest crequest = new ClusterRequest(cluster.getClusterId(), clusterName, null, null); crequest.setDesiredConfig(Collections.singletonList(cr)); - controller.updateClusters(Collections.singleton(crequest), new HashMap<String,String>()); + controller.updateClusters(Collections.singleton(crequest), new HashMap<>()); } else { Map<String, String> configs = new HashMap<>(); @@ -231,7 +231,7 @@ public class JMXHostProviderTest { ClusterRequest crequest = new ClusterRequest(cluster.getClusterId(), clusterName, null, null); crequest.setDesiredConfig(Collections.singletonList(cr)); - controller.updateClusters(Collections.singleton(crequest), new HashMap<String,String>()); + controller.updateClusters(Collections.singleton(crequest), new HashMap<>()); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java index d9b3af7..ca8127e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProviderTest.java @@ -11,7 +11,6 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.spi.Request; -import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.UnsupportedPropertyException; import org.apache.ambari.server.orm.dao.KerberosDescriptorDAO; import org.apache.ambari.server.orm.entities.KerberosDescriptorEntity; @@ -81,7 +80,7 @@ public class KerberosDescriptorResourceProviderTest { EasyMock.replay(request); kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null); + kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); // WHEN kerberosDescriptorResourceProvider.createResources(request); @@ -98,7 +97,7 @@ public class KerberosDescriptorResourceProviderTest { EasyMock.replay(request); kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null); + kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); // WHEN kerberosDescriptorResourceProvider.createResources(request); @@ -113,7 +112,7 @@ public class KerberosDescriptorResourceProviderTest { // GIVEN kerberosDescriptorResourceProvider = new KerberosDescriptorResourceProvider(kerberosDescriptorDAO, - kerberosDescriptorFactory, Collections.<String>emptySet(), Collections.<Resource.Type, String>emptyMap(), null); + kerberosDescriptorFactory, Collections.emptySet(), Collections.emptyMap(), null); EasyMock.expect(request.getProperties()) .andReturn(requestPropertySet(KERBEROS_DESCRIPTORS_KERBEROS_DESCRIPTOR_NAME, TEST_KERBEROS_DESCRIPTOR_NAME)) http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java index 489a94a..39ba4b9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java @@ -33,7 +33,6 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.MemberResponse; import org.apache.ambari.server.controller.RequestStatusResponse; import org.apache.ambari.server.controller.ResourceProviderFactory; import org.apache.ambari.server.controller.spi.Predicate; @@ -79,7 +78,7 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController))) + expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); managementController.createMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe")); @@ -135,11 +134,11 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController))) + expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); expect(managementController.getMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet(null, null))) - .andReturn(Collections.<MemberResponse>emptySet()) + .andReturn(Collections.emptySet()) .atLeastOnce(); // replay @@ -184,7 +183,7 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); // set expectations - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController))) + expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); managementController.updateMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", "joe")); @@ -239,7 +238,7 @@ public class MemberResourceProviderTest { AbstractControllerResourceProvider.init(resourceProviderFactory); // set expectations - expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.<Set<String>>anyObject(), EasyMock.<Map<Resource.Type, String>>anyObject(), eq(managementController))) + expect(resourceProviderFactory.getMemberResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), eq(managementController))) .andReturn(new MemberResourceProvider(PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController)).anyTimes(); managementController.deleteMembers(AbstractResourceProviderTest.Matcher.getMemberRequestSet("engineering", null)); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java index 3de20e4..e464329 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProviderTest.java @@ -142,7 +142,7 @@ public class PreUpgradeCheckResourceProviderTest { ResourceProvider provider = getPreUpgradeCheckResourceProvider(managementController, injector); // create the request - Request request = PropertyHelper.getReadRequest(new HashSet<String>()); + Request request = PropertyHelper.getReadRequest(new HashSet<>()); PredicateBuilder builder = new PredicateBuilder(); Predicate predicate = builder.property(PreUpgradeCheckResourceProvider.UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and() .property(PreUpgradeCheckResourceProvider.UPGRADE_CHECK_UPGRADE_PACK_PROPERTY_ID).equals("upgrade_pack11").and() http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java index 69bb17c..5ed582f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java @@ -73,8 +73,8 @@ public class ProvisionClusterRequestTest { private static final Blueprint blueprint = createNiceMock(Blueprint.class); private static final ResourceProvider hostResourceProvider = createMock(ResourceProvider.class); private static final Configuration blueprintConfig = new Configuration( - Collections.<String, Map<String, String>>emptyMap(), - Collections.<String, Map<String, Map<String, String>>>emptyMap()); + Collections.emptyMap(), + Collections.emptyMap()); @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -92,7 +92,7 @@ public class ProvisionClusterRequestTest { expect(blueprintFactory.getBlueprint(BLUEPRINT_NAME)).andReturn(blueprint).once(); expect(blueprint.getConfiguration()).andReturn(blueprintConfig).anyTimes(); expect(hostResourceProvider.checkPropertyIds(Collections.singleton("Hosts/host_name"))). - andReturn(Collections.<String>emptySet()).once(); + andReturn(Collections.emptySet()).once(); replay(blueprintFactory, blueprint, hostResourceProvider); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProviderTest.java index 2708da7..9ce6471 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProviderTest.java @@ -87,7 +87,7 @@ public class QuickLinkArtifactResourceProviderTest { property(QuickLinkArtifactResourceProvider.STACK_SERVICE_NAME_PROPERTY_ID).equals("YARN"). toPredicate(); Set<Resource> resources = - provider.getResources(PropertyHelper.getReadRequest(Sets.<String>newHashSet()), predicate); + provider.getResources(PropertyHelper.getReadRequest(Sets.newHashSet()), predicate); Map<String, Link> linkMap = getLinks(resources); for (Map.Entry<String, Link> entry: linkMap.entrySet()) { @@ -112,7 +112,7 @@ public class QuickLinkArtifactResourceProviderTest { property(QuickLinkArtifactResourceProvider.STACK_SERVICE_NAME_PROPERTY_ID).equals("YARN"). toPredicate(); Set<Resource> resources = - provider.getResources(PropertyHelper.getReadRequest(Sets.<String>newHashSet()), predicate); + provider.getResources(PropertyHelper.getReadRequest(Sets.newHashSet()), predicate); Map<String, Link> linkMap = getLinks(resources); for (Link link: linkMap.values()) { @@ -136,7 +136,7 @@ public class QuickLinkArtifactResourceProviderTest { property(QuickLinkArtifactResourceProvider.STACK_SERVICE_NAME_PROPERTY_ID).equals("YARN"). toPredicate(); Set<Resource> resources = - provider.getResources(PropertyHelper.getReadRequest(Sets.<String>newHashSet()), predicate); + provider.getResources(PropertyHelper.getReadRequest(Sets.newHashSet()), predicate); Map<String, Link> linkMap = getLinks(resources); for (Link link: linkMap.values()) { http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java index 409eaad..6a0ab89 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.RepositoryRequest; import org.apache.ambari.server.controller.RepositoryResponse; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; @@ -62,7 +61,7 @@ public class RepositoryResourceProviderTest { allResponse.add(rr); // set expectations - expect(managementController.getRepositories(EasyMock.<Set<RepositoryRequest>>anyObject())).andReturn(allResponse).times(2); + expect(managementController.getRepositories(EasyMock.anyObject())).andReturn(allResponse).times(2); // replay replay(managementController); @@ -158,7 +157,7 @@ public class RepositoryResourceProviderTest { allResponse.add(rr); // set expectations - expect(managementController.getRepositories(EasyMock.<Set<RepositoryRequest>>anyObject())).andReturn(allResponse).times(1); + expect(managementController.getRepositories(EasyMock.anyObject())).andReturn(allResponse).times(1); // 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/RequestImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java index 3becc02..7c6b4bd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java @@ -20,7 +20,6 @@ package org.apache.ambari.server.controller.internal; import java.util.Collections; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.ResourceProviderFactory; @@ -284,9 +283,9 @@ public class RequestImplTest { @Test public void testDryRunRequest() { - Request dryRunRequest = PropertyHelper.getCreateRequest(Collections.<Map<String,Object>>emptySet(), Collections.singletonMap(Request.DIRECTIVE_DRY_RUN, "true")); - Request nonDryRunReqest1 = PropertyHelper.getCreateRequest(Collections.<Map<String,Object>>emptySet(), Collections.singletonMap(Request.DIRECTIVE_DRY_RUN, "false")); - Request nonDryRunReqest2 = PropertyHelper.getCreateRequest(Collections.<Map<String,Object>>emptySet(), Collections.<String, String>emptyMap()); + Request dryRunRequest = PropertyHelper.getCreateRequest(Collections.emptySet(), Collections.singletonMap(Request.DIRECTIVE_DRY_RUN, "true")); + Request nonDryRunReqest1 = PropertyHelper.getCreateRequest(Collections.emptySet(), Collections.singletonMap(Request.DIRECTIVE_DRY_RUN, "false")); + Request nonDryRunReqest2 = PropertyHelper.getCreateRequest(Collections.emptySet(), Collections.emptyMap()); Assert.assertTrue(dryRunRequest.isDryRunRequest()); Assert.assertFalse(nonDryRunReqest1.isDryRunRequest()); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java index d2c462b..b2e9472 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java @@ -126,10 +126,10 @@ public class RequestResourceProviderTest { //todo: add assertions for topology manager interactions expect(topologyManager.getStageSummaries(EasyMock.<Long>anyObject())).andReturn( - Collections.<Long, HostRoleCommandStatusSummaryDTO>emptyMap()).anyTimes(); + Collections.emptyMap()).anyTimes(); - expect(topologyManager.getRequests(EasyMock.<Collection<Long>>anyObject())).andReturn( - Collections.<LogicalRequest>emptyList()).anyTimes(); + expect(topologyManager.getRequests(EasyMock.anyObject())).andReturn( + Collections.emptyList()).anyTimes(); replay(topologyManager); @@ -204,7 +204,7 @@ public class RequestResourceProviderTest { public void testGetResourcesWithRequestInfo() throws Exception { Resource.Type type = Resource.Type.Request; - expect(requestDAO.findByPks(Collections.<Long> emptyList(), true)).andReturn(Collections.<RequestEntity>emptyList()).anyTimes(); + expect(requestDAO.findByPks(Collections.emptyList(), true)).andReturn(Collections.emptyList()).anyTimes(); ActionManager actionManager = createNiceMock(ActionManager.class); @@ -235,17 +235,17 @@ public class RequestResourceProviderTest { .equals(null) .toPredicate(); - request = PropertyHelper.getReadRequest(new HashSet<String>(), + request = PropertyHelper.getReadRequest(new HashSet<>(), requestInfoProperties, null, null, null); - expect(requestDAO.findAllRequestIds(BaseRequest.DEFAULT_PAGE_SIZE, false, 1L)).andReturn(Collections.<Long> emptyList()).anyTimes(); + expect(requestDAO.findAllRequestIds(BaseRequest.DEFAULT_PAGE_SIZE, false, 1L)).andReturn(Collections.emptyList()).anyTimes(); replay(requestDAO); provider.getResources(request, predicate); verify(requestDAO); requestInfoProperties.put(BaseRequest.PAGE_SIZE_PROPERTY_KEY, "20"); - request = PropertyHelper.getReadRequest(new HashSet<String>(), + request = PropertyHelper.getReadRequest(new HashSet<>(), requestInfoProperties, null, null, null); provider.getResources(request, predicate); verify(requestDAO); @@ -253,10 +253,10 @@ public class RequestResourceProviderTest { reset(requestDAO); requestInfoProperties.put(BaseRequest.ASC_ORDER_PROPERTY_KEY, "true"); - request = PropertyHelper.getReadRequest(new HashSet<String>(), + request = PropertyHelper.getReadRequest(new HashSet<>(), requestInfoProperties, null, null, null); - expect(requestDAO.findByPks(Collections.<Long> emptyList(), true)).andReturn(Collections.<RequestEntity>emptyList()).anyTimes(); - expect(requestDAO.findAllRequestIds(BaseRequest.DEFAULT_PAGE_SIZE, true, 1L)).andReturn(Collections.<Long> emptyList()).anyTimes(); + expect(requestDAO.findByPks(Collections.emptyList(), true)).andReturn(Collections.emptyList()).anyTimes(); + expect(requestDAO.findAllRequestIds(BaseRequest.DEFAULT_PAGE_SIZE, true, 1L)).andReturn(Collections.emptyList()).anyTimes(); replay(requestDAO); provider.getResources(request, predicate); @@ -1631,7 +1631,7 @@ public class RequestResourceProviderTest { expect(clusters.getCluster(anyObject(String.class))).andReturn(null).anyTimes(); expect(requestDAO.findByPks(capture(requestIdsCapture), eq(true))).andReturn(Collections.singletonList(requestMock)); expect(hrcDAO.findAggregateCounts((Long) anyObject())).andReturn( - Collections.<Long, HostRoleCommandStatusSummaryDTO>emptyMap()).anyTimes(); + Collections.emptyMap()).anyTimes(); // replay replay(managementController, actionManager, clusters, requestMock, requestDAO, hrcDAO); @@ -1710,7 +1710,7 @@ public class RequestResourceProviderTest { expect(clusters.getClusterById(clusterId)).andReturn(cluster).anyTimes(); expect(requestDAO.findByPks(capture(requestIdsCapture), eq(true))).andReturn(Lists.newArrayList(requestMock)); expect(hrcDAO.findAggregateCounts((Long) anyObject())).andReturn( - Collections.<Long, HostRoleCommandStatusSummaryDTO>emptyMap()).anyTimes(); + Collections.emptyMap()).anyTimes(); Map<String, HostGroupInfo> hostGroupInfoMap = new HashMap<>(); HostGroupInfo hostGroupInfo = new HostGroupInfo("host_group_1"); @@ -1750,7 +1750,7 @@ public class RequestResourceProviderTest { expect(topologyManager.getRequests(eq(Collections.singletonList(100L)))).andReturn( Collections.singletonList(logicalRequest)).anyTimes(); expect(topologyManager.getStageSummaries(EasyMock.<Long>anyObject())).andReturn( - Collections.<Long, HostRoleCommandStatusSummaryDTO>emptyMap()).anyTimes(); + Collections.emptyMap()).anyTimes(); replay(actionManager, requestMock, requestDAO, hrcDAO, topologyManager, logicalRequest, hostRequest); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java index 613f8e9..5894a54 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestStageContainerTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; @@ -119,7 +118,7 @@ public class RequestStageContainerTest { expect(stage1.getHostRoleCommands()).andReturn(Collections.singletonMap(hostname, Collections.singletonMap(componentName, command1))).anyTimes(); expect(stage2.getHostRoleCommands()).andReturn(Collections.singletonMap(hostname, Collections.singletonMap(componentName, command2))).anyTimes(); expect(stage3.getHostRoleCommands()).andReturn(Collections.singletonMap(hostname, Collections.singletonMap(componentName, command3))).anyTimes(); - expect(stage4.getHostRoleCommands()).andReturn(Collections.<String, Map<String, HostRoleCommand>>emptyMap()).anyTimes(); + expect(stage4.getHostRoleCommands()).andReturn(Collections.emptyMap()).anyTimes(); expect(command3.getRoleCommand()).andReturn(RoleCommand.SERVICE_CHECK).anyTimes(); expect(command2.getRoleCommand()).andReturn(RoleCommand.INSTALL).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProviderTest.java index 6be5142..a202516 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProviderTest.java @@ -27,7 +27,6 @@ import java.util.Set; import org.apache.ambari.server.controller.RootServiceResponseFactory; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.junit.Assert; import org.junit.Test; @@ -77,7 +76,7 @@ public class RootServiceComponentPropertyProviderTest { requestIds.add(RootServiceComponentPropertyProvider.JCE_POLICY_PROPERTY_ID); } - Request request = PropertyHelper.getReadRequest(requestIds, new HashMap<String, TemporalInfo>()); + Request request = PropertyHelper.getReadRequest(requestIds, new HashMap<>()); Set<Resource> resources = propertyProvider.populateResources(Collections.singleton(resource), request, null); Assert.assertEquals(1, resources.size()); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java index f60f982..222340b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProviderTest.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.RootServiceComponentRequest; import org.apache.ambari.server.controller.RootServiceComponentResponse; import org.apache.ambari.server.controller.RootServiceResponseFactory; import org.apache.ambari.server.controller.spi.Predicate; @@ -63,8 +62,8 @@ public class RootServiceComponentResourceProviderTest { // set expectations - expect(managementController.getRootServiceComponents(EasyMock.<Set<RootServiceComponentRequest>>anyObject())).andReturn(allResponse).once(); - expect(managementController.getRootServiceComponents(EasyMock.<Set<RootServiceComponentRequest>>anyObject())).andReturn(nameResponse).once(); + expect(managementController.getRootServiceComponents(EasyMock.anyObject())).andReturn(allResponse).once(); + expect(managementController.getRootServiceComponents(EasyMock.anyObject())).andReturn(nameResponse).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/RootServiceHostComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java index ce65c53..ce3656c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java @@ -77,7 +77,7 @@ public class RootServiceHostComponentResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(clusters.getHosts()).andReturn(hosts).anyTimes(); - expect(factory.getRootServiceHostComponent((RootServiceHostComponentRequest) anyObject(), EasyMock.<Set<HostResponse>>anyObject())). + expect(factory.getRootServiceHostComponent((RootServiceHostComponentRequest) anyObject(), EasyMock.anyObject())). andReturn(responseSet).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/RootServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java index 91f8ccd..96bc7c9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceResourceProviderTest.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.RootServiceRequest; import org.apache.ambari.server.controller.RootServiceResponse; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; @@ -57,8 +56,8 @@ public class RootServiceResourceProviderTest { // set expectations - expect(managementController.getRootServices(EasyMock.<Set<RootServiceRequest>>anyObject())).andReturn(allResponse).once(); - expect(managementController.getRootServices(EasyMock.<Set<RootServiceRequest>>anyObject())).andReturn(nameResponse).once(); + expect(managementController.getRootServices(EasyMock.anyObject())).andReturn(allResponse).once(); + expect(managementController.getRootServices(EasyMock.anyObject())).andReturn(nameResponse).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/ScaleClusterRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java index 6d16894..2a03b1f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java @@ -70,8 +70,8 @@ public class ScaleClusterRequestTest { private static final ResourceProvider hostResourceProvider = createMock(ResourceProvider.class); private static final HostGroup hostGroup1 = createNiceMock(HostGroup.class); private static final Configuration blueprintConfig = new Configuration( - Collections.<String, Map<String, String>>emptyMap(), - Collections.<String, Map<String, Map<String, String>>>emptyMap()); + Collections.emptyMap(), + Collections.emptyMap()); @Before public void setUp() throws Exception { @@ -89,7 +89,7 @@ public class ScaleClusterRequestTest { expect(blueprint.getHostGroup(GROUP3_NAME)).andReturn(hostGroup1).anyTimes(); expect(blueprint.getName()).andReturn(BLUEPRINT_NAME).anyTimes(); expect(hostResourceProvider.checkPropertyIds(Collections.singleton("test/prop"))). - andReturn(Collections.<String>emptySet()).once(); + andReturn(Collections.emptySet()).once(); replay(blueprintFactory, blueprint, hostResourceProvider, hostGroup1); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java index 2bb7b7a..20730d1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java @@ -50,8 +50,6 @@ import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.controller.MaintenanceStateHelper; 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.ServiceRequest; import org.apache.ambari.server.controller.ServiceResponse; import org.apache.ambari.server.controller.spi.Predicate; @@ -214,8 +212,8 @@ public class ServiceResourceProviderTest { // 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(); @@ -332,8 +330,8 @@ public class ServiceResourceProviderTest { // 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(); @@ -400,8 +398,8 @@ public class ServiceResourceProviderTest { // 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(); @@ -467,8 +465,8 @@ public class ServiceResourceProviderTest { // 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(); @@ -536,8 +534,8 @@ public class ServiceResourceProviderTest { // 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(); @@ -629,7 +627,7 @@ public class ServiceResourceProviderTest { expect(cluster.getService("Service102")).andReturn(service0); expect(service0.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); - expect(service0.getServiceComponents()).andReturn(Collections.<String, ServiceComponent>emptyMap()).anyTimes(); + expect(service0.getServiceComponents()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackId.getStackId()).andReturn("HDP-2.5").anyTimes(); expect(stackId.getStackName()).andReturn("HDP").anyTimes(); @@ -660,7 +658,7 @@ public class ServiceResourceProviderTest { expect(managementController.getRoleCommandOrder(cluster)).andReturn(rco). anyTimes(); expect(rco.getTransitiveServices(eq(service0), eq(RoleCommand.START))). - andReturn(Collections.<Service>emptySet()).anyTimes(); + andReturn(Collections.emptySet()).anyTimes(); // replay replay(managementController, clusters, cluster, rco, maintenanceStateHelper, @@ -731,10 +729,10 @@ public class ServiceResourceProviderTest { mapRequestProps.put("context", "Called from a test"); // set expectations - expect(managementController1.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). - andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); - expect(managementController2.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). - andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); + expect(managementController1.getHostComponents(EasyMock.anyObject())). + andReturn(Collections.emptySet()).anyTimes(); + expect(managementController2.getHostComponents(EasyMock.anyObject())). + andReturn(Collections.emptySet()).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -758,7 +756,7 @@ public class ServiceResourceProviderTest { expect(service0.convertToResponse()).andReturn(serviceResponse0).anyTimes(); expect(service0.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); - expect(service0.getServiceComponents()).andReturn(Collections.<String, ServiceComponent>emptyMap()).anyTimes(); + expect(service0.getServiceComponents()).andReturn(Collections.emptyMap()).anyTimes(); expect(serviceResponse0.getClusterName()).andReturn("Cluster100").anyTimes(); expect(serviceResponse0.getServiceName()).andReturn("Service102").anyTimes(); @@ -795,7 +793,7 @@ public class ServiceResourceProviderTest { expect(managementController2.getRoleCommandOrder(cluster)).andReturn(rco). anyTimes(); expect(rco.getTransitiveServices(eq(service0), eq(RoleCommand.START))). - andReturn(Collections.<Service>emptySet()).anyTimes(); + andReturn(Collections.emptySet()).anyTimes(); // replay replay(managementController1, response1, managementController2, requestStages1, requestStages2, @@ -870,7 +868,7 @@ public class ServiceResourceProviderTest { expect(cluster.getService(serviceName)).andReturn(service).anyTimes(); expect(service.getDesiredState()).andReturn(State.INSTALLED).anyTimes(); expect(service.getName()).andReturn(serviceName).anyTimes(); - expect(service.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(service.getServiceComponents()).andReturn(new HashMap<>()); expect(service.getCluster()).andReturn(cluster); cluster.deleteService(serviceName); @@ -918,7 +916,7 @@ public class ServiceResourceProviderTest { expect(cluster.getService(serviceName)).andReturn(service).anyTimes(); expect(service.getDesiredState()).andReturn(State.STARTED).anyTimes(); expect(service.getName()).andReturn(serviceName).anyTimes(); - expect(service.getServiceComponents()).andReturn(new HashMap<String, ServiceComponent>()); + expect(service.getServiceComponents()).andReturn(new HashMap<>()); expect(service.getCluster()).andReturn(cluster); cluster.deleteService(serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java index fd0edd8..8667e6c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitorTest.java @@ -80,7 +80,7 @@ public class SimplifyingPredicateVisitorTest { //expectations - expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.<String>emptySet()).anyTimes(); + expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.emptySet()).anyTimes(); replay(provider); @@ -158,7 +158,7 @@ public class SimplifyingPredicateVisitorTest { //reset assertions. For property D, indicate that it is not supported. verify(provider); reset(provider); - expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.<String>emptySet()); + expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.emptySet()); expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.singleton(PROPERTY_D)); replay(provider); @@ -172,7 +172,7 @@ public class SimplifyingPredicateVisitorTest { verify(provider); reset(provider); - expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.<String>emptySet()).anyTimes(); + expect(provider.checkPropertyIds(capture(propertiesCapture))).andReturn(Collections.emptySet()).anyTimes(); replay(provider); // --- http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java index f8203a6..ab60948 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProviderTest.java @@ -157,8 +157,8 @@ public class StackAdvisorResourceProviderTest { keyPropertyIds, ambariManagementController); Request request = mock(Request.class); - Set<Map<String, Object>> propertiesSet = new HashSet<Map<String, Object>>(); - Map<String, Object> propertiesMap = new HashMap<String, Object>(); + Set<Map<String, Object>> propertiesSet = new HashSet<>(); + Map<String, Object> propertiesMap = new HashMap<>(); propertiesMap.put("hosts", new LinkedHashSet<>()); propertiesMap.put("recommend", "configurations"); propertiesSet.add(propertiesMap); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java index e9e1b43..e3fa676 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java @@ -300,7 +300,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty("HostRoles/state", "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet(), new HashMap<>()); Set<Resource> set = sdpp.populateResources(Collections.singleton(resource), request, null); Assert.assertEquals(1, set.size()); @@ -331,7 +331,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty("HostRoles/state", "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet(), new HashMap<>()); Set<Resource> set = sdpp.populateResources(Collections.singleton(resource), request, null); Assert.assertEquals(1, set.size()); @@ -499,7 +499,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -527,7 +527,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); } @@ -559,7 +559,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -758,7 +758,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -882,7 +882,7 @@ public class StackDefinedPropertyProviderTest { resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED"); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -926,7 +926,7 @@ public class StackDefinedPropertyProviderTest { int preSize = resource.getPropertiesMap().size(); // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size()); @@ -961,7 +961,7 @@ public class StackDefinedPropertyProviderTest { // request with an empty set should get all supported properties - Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet()); + Request request = PropertyHelper.getReadRequest(Collections.emptySet()); Set<Resource> res = propertyProvider.populateResources(Collections.singleton(resource), request, null); Assert.assertEquals(1, res.size()); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java index 2085bbe..4281e33 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackResourceProviderTest.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.StackRequest; import org.apache.ambari.server.controller.StackResponse; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; @@ -52,7 +51,7 @@ public class StackResourceProviderTest { allResponse.add(new StackResponse("Stack2")); // set expectations - expect(managementController.getStacks(EasyMock.<Set<StackRequest>>anyObject())).andReturn(allResponse).once(); + expect(managementController.getStacks(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/StackServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java index 7a41ea4..2a2ef0b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackServiceResourceProviderTest.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.StackServiceRequest; import org.apache.ambari.server.controller.StackServiceResponse; import org.apache.ambari.server.controller.spi.Request; import org.apache.ambari.server.controller.spi.Resource; @@ -79,7 +78,7 @@ public class StackServiceResourceProviderTest { StackServiceResponse stackServiceResponse = createNiceMock(StackServiceResponse.class); expect(stackServiceResponse.getServiceProperties()).andReturn(TEST_SERVICE_PROPERTIES); - expect(managementController.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())) + expect(managementController.getStackServices(EasyMock.anyObject())) .andReturn(ImmutableSet.of(stackServiceResponse)); replay(managementController, stackServiceResponse); @@ -122,7 +121,7 @@ public class StackServiceResourceProviderTest { - expect(managementController.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())) + expect(managementController.getStackServices(EasyMock.anyObject())) .andReturn(ImmutableSet.of(stackServiceResponse)); replay(managementController); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java index 0f82d38..68257d1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackTest.java @@ -33,7 +33,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.Map; import java.util.Set; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -45,7 +44,6 @@ import org.apache.ambari.server.controller.StackServiceComponentRequest; import org.apache.ambari.server.controller.StackServiceComponentResponse; import org.apache.ambari.server.controller.StackServiceRequest; import org.apache.ambari.server.controller.StackServiceResponse; -import org.apache.ambari.server.state.DependencyInfo; import org.apache.ambari.server.state.PropertyDependencyInfo; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.ValueAttributesInfo; @@ -81,8 +79,8 @@ public class StackTest { expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes(); expect(stackServiceResponse.getServiceName()).andReturn("service1").anyTimes(); - expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.<String>emptySet()); - expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.<String, Map<String,Map<String,String>>>emptyMap()); + expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.emptySet()); + expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.emptyMap()); expect(controller.getStackComponents(capture(stackComponentRequestCapture))). andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); @@ -95,18 +93,18 @@ public class StackTest { // no stack level configs for this test expect(controller.getStackLevelConfigurations(capture(stackLevelConfigurationRequestCapture))). - andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes(); + andReturn(Collections.emptySet()).anyTimes(); expect(stackConfigurationResponse.getPropertyName()).andReturn("prop1").anyTimes(); expect(stackConfigurationResponse.getPropertyValue()).andReturn("prop1Val").anyTimes(); expect(stackConfigurationResponse.getType()).andReturn("test-site.xml").anyTimes(); expect(stackConfigurationResponse.getPropertyType()).andReturn( - Collections.<org.apache.ambari.server.state.PropertyInfo.PropertyType>emptySet()).anyTimes(); - expect(stackConfigurationResponse.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + Collections.emptySet()).anyTimes(); + expect(stackConfigurationResponse.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse.isRequired()).andReturn(true).anyTimes(); expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")). - andReturn(Collections.<DependencyInfo>emptyList()).anyTimes(); + andReturn(Collections.emptyList()).anyTimes(); replay(controller, stackServiceResponse, stackComponentResponse, stackConfigurationResponse, metaInfo); @@ -139,8 +137,8 @@ public class StackTest { StackConfigurationResponse mockResponse = mockSupport.createMock(StackConfigurationResponse.class); expect(mockResponse.getPropertyName()).andReturn("test-property-one"); expect(mockResponse.getPropertyValue()).andReturn("test-value-one"); - expect(mockResponse.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()); - expect(mockResponse.getPropertyType()).andReturn(Collections.<PropertyInfo.PropertyType>emptySet()); + expect(mockResponse.getPropertyAttributes()).andReturn(Collections.emptyMap()); + expect(mockResponse.getPropertyType()).andReturn(Collections.emptySet()); expect(mockResponse.getType()).andReturn("test-type-one"); expect(mockResponse.getDependsOnProperties()).andReturn(setOfDependencyInfo); expect(mockResponse.getPropertyValueAttributes()).andReturn(new ValueAttributesInfo()); @@ -177,8 +175,8 @@ public class StackTest { expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes(); expect(stackServiceResponse.getServiceName()).andReturn("service1").anyTimes(); - expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.<String>emptySet()); - expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.<String, Map<String,Map<String,String>>>emptyMap()); + expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.emptySet()); + expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.emptyMap()); expect(controller.getStackComponents(capture(stackComponentRequestCapture))). andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); @@ -192,14 +190,14 @@ public class StackTest { // no stack level configs for this test expect(controller.getStackLevelConfigurations(capture(stackLevelConfigurationRequestCapture))). - andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes(); + andReturn(Collections.emptySet()).anyTimes(); expect(stackConfigurationResponse.getPropertyName()).andReturn("prop1").anyTimes(); expect(stackConfigurationResponse.getPropertyValue()).andReturn(null).anyTimes(); expect(stackConfigurationResponse.getType()).andReturn("test-site.xml").anyTimes(); expect(stackConfigurationResponse.getPropertyType()).andReturn( Collections.singleton(PropertyInfo.PropertyType.PASSWORD)).anyTimes(); - expect(stackConfigurationResponse.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + expect(stackConfigurationResponse.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse.isRequired()).andReturn(true).anyTimes(); // not a PASSWORD property type so shouldn't be returned @@ -208,11 +206,11 @@ public class StackTest { expect(stackConfigurationResponse2.getType()).andReturn("test-site.xml").anyTimes(); expect(stackConfigurationResponse2.getPropertyType()).andReturn( Collections.singleton(PropertyInfo.PropertyType.USER)).anyTimes(); - expect(stackConfigurationResponse2.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + expect(stackConfigurationResponse2.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse2.isRequired()).andReturn(true).anyTimes(); expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")). - andReturn(Collections.<DependencyInfo>emptyList()).anyTimes(); + andReturn(Collections.emptyList()).anyTimes(); replay(controller, stackServiceResponse, stackComponentResponse, stackConfigurationResponse, stackConfigurationResponse2, metaInfo); @@ -262,14 +260,14 @@ public class StackTest { expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes(); - expect(controller.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes(); + expect(controller.getStackServices(EasyMock.anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes(); expect(stackServiceResponse.getServiceName()).andReturn(testServiceName).anyTimes(); - expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.<String>emptySet()); + expect(stackServiceResponse.getExcludedConfigTypes()).andReturn(Collections.emptySet()); // stack components expect(stackComponentResponse.getComponentName()).andReturn("component1").anyTimes(); expect(stackComponentResponse.getComponentCategory()).andReturn(testSiteConfigFile).anyTimes(); - expect(controller.getStackComponents(EasyMock.<Set<StackServiceComponentRequest>>anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); + expect(controller.getStackComponents(EasyMock.anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); // stack configurations @@ -278,25 +276,25 @@ public class StackTest { expect(stackConfigurationResponse1.getPropertyValue()).andReturn(null).anyTimes(); expect(stackConfigurationResponse1.getType()).andReturn(testSiteConfigFile).anyTimes(); expect(stackConfigurationResponse1.getPropertyType()).andReturn(Collections.singleton(PropertyInfo.PropertyType.TEXT)).anyTimes(); - expect(stackConfigurationResponse1.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + expect(stackConfigurationResponse1.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse1.isRequired()).andReturn(true).anyTimes(); expect(stackConfigurationResponse2.getPropertyName()).andReturn("prop2").anyTimes(); expect(stackConfigurationResponse2.getPropertyValue()).andReturn(null).anyTimes(); expect(stackConfigurationResponse2.getType()).andReturn(testSiteConfigFile).anyTimes(); expect(stackConfigurationResponse2.getPropertyType()).andReturn(Collections.singleton(PropertyInfo.PropertyType.USER)).anyTimes(); - expect(stackConfigurationResponse2.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + expect(stackConfigurationResponse2.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse2.isRequired()).andReturn(true).anyTimes(); - expect(controller.getStackConfigurations(EasyMock.<Set<StackConfigurationRequest>>anyObject())).andReturn(Sets.newHashSet(stackConfigurationResponse1, stackConfigurationResponse2)).anyTimes(); + expect(controller.getStackConfigurations(EasyMock.anyObject())).andReturn(Sets.newHashSet(stackConfigurationResponse1, stackConfigurationResponse2)).anyTimes(); // empty stack service config type - expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.<String, Map<String,String>>emptyMap())); + expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.emptyMap())); // no stack level configs for this test - expect(controller.getStackLevelConfigurations(EasyMock.<Set<StackLevelConfigurationRequest>>anyObject())).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes(); + expect(controller.getStackLevelConfigurations(EasyMock.anyObject())).andReturn(Collections.emptySet()).anyTimes(); - expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.<DependencyInfo>emptyList()).anyTimes(); + expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.emptyList()).anyTimes(); replay(controller, stackServiceResponse, stackComponentResponse, stackConfigurationResponse1, stackConfigurationResponse2, metaInfo); @@ -331,7 +329,7 @@ public class StackTest { expect(controller.getAmbariMetaInfo()).andReturn(metaInfo).anyTimes(); - expect(controller.getStackServices(EasyMock.<Set<StackServiceRequest>>anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes(); + expect(controller.getStackServices(EasyMock.anyObject())).andReturn(Collections.singleton(stackServiceResponse)).anyTimes(); expect(stackServiceResponse.getServiceName()).andReturn(testServiceName).anyTimes(); // Config type test-site is excluded for the service service1 @@ -340,23 +338,23 @@ public class StackTest { // stack components expect(stackComponentResponse.getComponentName()).andReturn("component1").anyTimes(); expect(stackComponentResponse.getComponentCategory()).andReturn(testSiteConfigFile).anyTimes(); - expect(controller.getStackComponents(EasyMock.<Set<StackServiceComponentRequest>>anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); + expect(controller.getStackComponents(EasyMock.anyObject())).andReturn(Collections.singleton(stackComponentResponse)).anyTimes(); expect(stackConfigurationResponse1.getPropertyName()).andReturn("prop1").anyTimes(); expect(stackConfigurationResponse1.getPropertyValue()).andReturn(null).anyTimes(); expect(stackConfigurationResponse1.getType()).andReturn(testSiteConfigFile).anyTimes(); expect(stackConfigurationResponse1.getPropertyType()).andReturn(Collections.singleton(PropertyInfo.PropertyType.TEXT)).anyTimes(); - expect(stackConfigurationResponse1.getPropertyAttributes()).andReturn(Collections.<String, String>emptyMap()).anyTimes(); + expect(stackConfigurationResponse1.getPropertyAttributes()).andReturn(Collections.emptyMap()).anyTimes(); expect(stackConfigurationResponse1.isRequired()).andReturn(true).anyTimes(); - expect(controller.getStackConfigurations(EasyMock.<Set<StackConfigurationRequest>>anyObject())).andReturn(Collections.singleton(stackConfigurationResponse1)).anyTimes(); + expect(controller.getStackConfigurations(EasyMock.anyObject())).andReturn(Collections.singleton(stackConfigurationResponse1)).anyTimes(); // empty stack service config type - expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.<String, Map<String, String>>emptyMap())); + expect(stackServiceResponse.getConfigTypes()).andReturn(Collections.singletonMap(testEmptyConfigType, Collections.emptyMap())); // no stack level configs for this test - expect(controller.getStackLevelConfigurations(EasyMock.<Set<StackLevelConfigurationRequest>>anyObject())).andReturn(Collections.<StackConfigurationResponse>emptySet()).anyTimes(); - expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.<DependencyInfo>emptyList()).anyTimes(); + expect(controller.getStackLevelConfigurations(EasyMock.anyObject())).andReturn(Collections.emptySet()).anyTimes(); + expect(metaInfo.getComponentDependencies("test", "1.0", "service1", "component1")).andReturn(Collections.emptyList()).anyTimes(); replay(controller, stackServiceResponse, stackComponentResponse, stackConfigurationResponse1, metaInfo); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java index 9f3f01f..734fa96 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java @@ -58,7 +58,6 @@ import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.DesiredConfig; import org.apache.ambari.server.state.RepositoryType; import org.apache.ambari.server.state.Service; -import org.apache.ambari.server.state.ServiceComponent; import org.apache.ambari.server.state.ServiceComponentFactory; import org.apache.ambari.server.state.ServiceComponentHostFactory; import org.apache.ambari.server.state.ServiceFactory; @@ -215,7 +214,7 @@ public class StackUpgradeConfigurationMergeTest extends EasyMockSupport { Service zookeeper = createNiceMock(Service.class); expect(zookeeper.getName()).andReturn("ZOOKEEPER").atLeastOnce(); expect(zookeeper.getServiceComponents()).andReturn( - new HashMap<String, ServiceComponent>()).once(); + new HashMap<>()).once(); zookeeper.setDesiredRepositoryVersion(repoVersion220); expectLastCall().once(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java index aed3ee0..9193722 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java @@ -85,7 +85,7 @@ public class StageResourceProviderTest { hrcDao = createStrictMock(HostRoleCommandDAO.class); topologyManager = EasyMock.createNiceMock(TopologyManager.class); - expect(topologyManager.getStages()).andReturn(new ArrayList<StageEntity>()).atLeastOnce(); + expect(topologyManager.getStages()).andReturn(new ArrayList<>()).atLeastOnce(); expect(hrcDao.findAggregateCounts(EasyMock.anyObject(Long.class))).andReturn( new HashMap<Long, HostRoleCommandStatusSummaryDTO>() { @@ -128,7 +128,7 @@ public class StageResourceProviderTest { Predicate predicate = createNiceMock(Predicate.class); expect(clusters.getClusterById(anyLong())).andReturn(cluster).anyTimes(); - expect(request.getProperties()).andReturn(Collections.<Map<String,Object>>emptySet()); + expect(request.getProperties()).andReturn(Collections.emptySet()); replay(clusters, cluster, request, predicate); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java index b0d48fe..492c012 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java @@ -87,7 +87,7 @@ public class TargetClusterResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), @@ -134,7 +134,7 @@ public class TargetClusterResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), @@ -183,7 +183,7 @@ public class TargetClusterResourceProviderTest { propertySet.add(properties); - Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap()); + Request request = PropertyHelper.getCreateRequest(propertySet, Collections.emptyMap()); TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service, PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster), http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index 08c86dd..5eca6b3 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -172,7 +172,7 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { expect( configHelper.getDefaultProperties(EasyMock.anyObject(StackId.class), EasyMock.anyString())).andReturn( - new HashMap<String, Map<String, String>>()).anyTimes(); + new HashMap<>()).anyTimes(); replay(configHelper); @@ -620,7 +620,7 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { RequestEntity requestEntity = new RequestEntity(); requestEntity.setRequestId(2L); requestEntity.setClusterId(cluster.getClusterId()); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDao.create(requestEntity); UpgradeEntity upgradeEntity = new UpgradeEntity(); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java index 353481c..4834ef8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java @@ -215,7 +215,7 @@ public class UpgradeSummaryResourceProviderTest { hrc1.setRoleCommand(RoleCommand.RESTART); hrc1.setHostEntity(h1); - stageEntity.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); + stageEntity.setHostRoleCommands(new ArrayList<>()); stageEntity.getHostRoleCommands().add(hrc1); h1.getHostRoleCommandEntities().add(hrc1); @@ -262,7 +262,7 @@ public class UpgradeSummaryResourceProviderTest { requestEntity.setRequestId(1L); requestEntity.setClusterId(cluster.getClusterId()); requestEntity.setStatus(HostRoleStatus.PENDING); - requestEntity.setStages(new ArrayList<StageEntity>()); + requestEntity.setStages(new ArrayList<>()); requestDAO.create(requestEntity); UpgradeEntity upgrade = new UpgradeEntity(); @@ -320,7 +320,7 @@ public class UpgradeSummaryResourceProviderTest { hrc2.setCommandDetail("Restart ZOOKEEPER_SERVER"); hrc2.setHostEntity(h1); - nextStage.setHostRoleCommands(new ArrayList<HostRoleCommandEntity>()); + nextStage.setHostRoleCommands(new ArrayList<>()); nextStage.getHostRoleCommands().add(hrc2); h1.getHostRoleCommandEntities().add(hrc2); http://git-wip-us.apache.org/repos/asf/ambari/blob/ab8d58ba/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java index 4c52e11..8051423 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java @@ -288,7 +288,7 @@ public class UserAuthorizationResourceProviderTest extends EasyMockSupport { PermissionEntity emptyPermissionEntity = createMock(PermissionEntity.class); expect(emptyPermissionEntity.getAuthorizations()) - .andReturn(Collections.<RoleAuthorizationEntity>emptyList()) + .andReturn(Collections.emptyList()) .anyTimes(); PermissionEntity nullPermissionEntity = createMock(PermissionEntity.class);
