http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java index 3e1c4c5..6fd1a23 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JobResourceProviderTest.java @@ -52,7 +52,7 @@ public class JobResourceProviderTest { public void testGetResources() throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> expected = new HashSet<Resource>(); + Set<Resource> expected = new HashSet<>(); expected.add(createJobResponse("Cluster100", "workflow1", "job1")); expected.add(createJobResponse("Cluster100", "workflow2", "job2")); expected.add(createJobResponse("Cluster100", "workflow2", "job3")); @@ -77,7 +77,7 @@ public class JobResourceProviderTest { Set<Resource> resources = provider.getResources(request, predicate); Assert.assertEquals(3, resources.size()); - Set<String> names = new HashSet<String>(); + Set<String> names = new HashSet<>(); for (Resource resource : resources) { String clusterName = (String) resource .getPropertyValue(JobResourceProvider.JOB_CLUSTER_NAME_PROPERTY_ID); @@ -98,7 +98,7 @@ public class JobResourceProviderTest { public void testJobFetcher1() throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<String> requestedIds = new HashSet<String>(); + Set<String> requestedIds = new HashSet<>(); requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); Map<Resource.Type,String> keyPropertyIds = PropertyHelper @@ -124,7 +124,7 @@ public class JobResourceProviderTest { public void testJobFetcher2() throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<String> requestedIds = new HashSet<String>(); + Set<String> requestedIds = new HashSet<>(); requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID); @@ -153,7 +153,7 @@ public class JobResourceProviderTest { public void testJobFetcher3() throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<String> requestedIds = new HashSet<String>(); + Set<String> requestedIds = new HashSet<>(); requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID); @@ -182,7 +182,7 @@ public class JobResourceProviderTest { public void testJobFetcher4() throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<String> requestedIds = new HashSet<String>(); + Set<String> requestedIds = new HashSet<>(); requestedIds.add(JobResourceProvider.JOB_ID_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_SUBMIT_TIME_PROPERTY_ID); requestedIds.add(JobResourceProvider.JOB_ELAPSED_TIME_PROPERTY_ID);
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java index 7660c2a..5229d3d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java @@ -53,10 +53,10 @@ public class LdapSyncEventResourceProviderTest { LdapSyncEventResourceProvider provider = new TestLdapSyncEventResourceProvider(amc); - Set<Map<String, Object>> properties = new HashSet<Map<String, Object>>(); - Map<String, Object> propertyMap = new HashMap<String, Object>(); + Set<Map<String, Object>> properties = new HashSet<>(); + Map<String, Object> propertyMap = new HashMap<>(); - Set<Map<String, String>> specs = new HashSet<Map<String, String>>(); + Set<Map<String, String>> specs = new HashSet<>(); propertyMap.put(LdapSyncEventResourceProvider.EVENT_SPECS_PROPERTY_ID, specs); properties.add(propertyMap); @@ -73,10 +73,10 @@ public class LdapSyncEventResourceProviderTest { LdapSyncEventResourceProvider provider = new TestLdapSyncEventResourceProvider(amc); - Set<Map<String, Object>> properties = new HashSet<Map<String, Object>>(); - Map<String, Object> propertyMap = new HashMap<String, Object>(); + Set<Map<String, Object>> properties = new HashSet<>(); + Map<String, Object> propertyMap = new HashMap<>(); - Set<Map<String, String>> specs = new HashSet<Map<String, String>>(); + Set<Map<String, String>> specs = new HashSet<>(); propertyMap.put(LdapSyncEventResourceProvider.EVENT_SPECS_PROPERTY_ID, specs); properties.add(propertyMap); @@ -109,10 +109,10 @@ public class LdapSyncEventResourceProviderTest { LdapSyncEventResourceProvider provider = new TestLdapSyncEventResourceProvider(amc); - Set<Map<String, Object>> properties = new HashSet<Map<String, Object>>(); - Map<String, Object> propertyMap = new HashMap<String, Object>(); + Set<Map<String, Object>> properties = new HashSet<>(); + Map<String, Object> propertyMap = new HashMap<>(); - Set<Map<String, String>> specs = new HashSet<Map<String, String>>(); + Set<Map<String, String>> specs = new HashSet<>(); propertyMap.put(LdapSyncEventResourceProvider.EVENT_SPECS_PROPERTY_ID, specs); properties.add(propertyMap); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 0a50844..489a94a 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 @@ -97,9 +97,9 @@ public class MemberResourceProviderTest { managementController); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); // add properties to the request map properties.put(MemberResourceProvider.MEMBER_GROUP_NAME_PROPERTY_ID, "engineering"); @@ -202,7 +202,7 @@ public class MemberResourceProviderTest { managementController); // add the property map to a set for the request. - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(MemberResourceProvider.MEMBER_GROUP_NAME_PROPERTY_ID, "engineering"); properties.put(MemberResourceProvider.MEMBER_USER_NAME_PROPERTY_ID, "joe"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PageResponseImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PageResponseImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PageResponseImplTest.java index 88ef27f..ad260cc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PageResponseImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PageResponseImplTest.java @@ -33,7 +33,7 @@ public class PageResponseImplTest { @Test public void testGetIterable() throws Exception { - Iterable<Resource> iterable = new HashSet<Resource>(); + Iterable<Resource> iterable = new HashSet<>(); Resource prev = new ResourceImpl(Resource.Type.Cluster); Resource next = new ResourceImpl(Resource.Type.Cluster); @@ -44,7 +44,7 @@ public class PageResponseImplTest { @Test public void testGetOffset() throws Exception { - Iterable<Resource> iterable = new HashSet<Resource>(); + Iterable<Resource> iterable = new HashSet<>(); Resource prev = new ResourceImpl(Resource.Type.Cluster); Resource next = new ResourceImpl(Resource.Type.Cluster); @@ -55,7 +55,7 @@ public class PageResponseImplTest { @Test public void testGetPreviousResource() throws Exception { - Iterable<Resource> iterable = new HashSet<Resource>(); + Iterable<Resource> iterable = new HashSet<>(); Resource prev = new ResourceImpl(Resource.Type.Cluster); Resource next = new ResourceImpl(Resource.Type.Cluster); @@ -66,7 +66,7 @@ public class PageResponseImplTest { @Test public void testGetNextResource() throws Exception { - Iterable<Resource> iterable = new HashSet<Resource>(); + Iterable<Resource> iterable = new HashSet<>(); Resource prev = new ResourceImpl(Resource.Type.Cluster); Resource next = new ResourceImpl(Resource.Type.Cluster); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java index c4d4868..9c438b0 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java @@ -66,7 +66,7 @@ public class PermissionResourceProviderTest { @Test public void testGetResources() throws Exception { - List<PermissionEntity> permissionEntities = new LinkedList<PermissionEntity>(); + List<PermissionEntity> permissionEntities = new LinkedList<>(); PermissionEntity permissionEntity = createNiceMock(PermissionEntity.class); ResourceTypeEntity resourceTypeEntity = createNiceMock(ResourceTypeEntity.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 de93ff4..37a3f13 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 @@ -99,9 +99,9 @@ public class PreUpgradeCheckResourceProviderTest { ServiceFactory serviceFactory = createNiceMock(ServiceFactory.class); AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); - Map<String, Service> allServiceMap = new HashMap<String, Service>(); + Map<String, Service> allServiceMap = new HashMap<>(); allServiceMap.put("Service100", service); - Map<String, ServiceInfo> allServiceInfoMap = new HashMap<String, ServiceInfo>(); + Map<String, ServiceInfo> allServiceInfoMap = new HashMap<>(); allServiceInfoMap.put("Service100", serviceInfo); // set expectations @@ -122,8 +122,8 @@ public class PreUpgradeCheckResourceProviderTest { expect(repo.getStackId()).andReturn(targetStackId).atLeastOnce(); expect(upgradeHelper.suggestUpgradePack("Cluster100", "1.0", "Repo100", Direction.UPGRADE, UpgradeType.NON_ROLLING, "upgrade_pack11")).andReturn(upgradePack); - List<AbstractCheckDescriptor> upgradeChecksToRun = new LinkedList<AbstractCheckDescriptor>(); - List<String> prerequisiteChecks = new LinkedList<String>(); + List<AbstractCheckDescriptor> upgradeChecksToRun = new LinkedList<>(); + List<String> prerequisiteChecks = new LinkedList<>(); prerequisiteChecks.add("org.apache.ambari.server.sample.checks.SampleServiceCheck"); expect(upgradePack.getPrerequisiteCheckConfig()).andReturn(config); expect(upgradePack.getPrerequisiteChecks()).andReturn(prerequisiteChecks).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 6bbdb3f..73a80f6 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 @@ -495,34 +495,34 @@ public class ProvisionClusterRequestTest { } public static Map<String, Object> createBlueprintRequestProperties(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); - Collection<Map<String, Object>> hostGroups = new ArrayList<Map<String, Object>>(); + Collection<Map<String, Object>> hostGroups = new ArrayList<>(); properties.put("host_groups", hostGroups); // host group 1 - Map<String, Object> hostGroup1Properties = new HashMap<String, Object>(); + Map<String, Object> hostGroup1Properties = new HashMap<>(); hostGroups.add(hostGroup1Properties); hostGroup1Properties.put("name", "group1"); - Collection<Map<String, String>> hostGroup1Hosts = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup1Hosts = new ArrayList<>(); hostGroup1Properties.put("hosts", hostGroup1Hosts); - Map<String, String> hostGroup1HostProperties = new HashMap<String, String>(); + Map<String, String> hostGroup1HostProperties = new HashMap<>(); hostGroup1HostProperties.put("fqdn", "host1.myDomain.com"); hostGroup1Hosts.add(hostGroup1HostProperties); // host group 1 scoped configuration // version 1 configuration syntax - Collection<Map<String, String>> hostGroup1Configurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup1Configurations = new ArrayList<>(); hostGroup1Properties.put("configurations", hostGroup1Configurations); - Map<String, String> hostGroup1Configuration1 = new HashMap<String, String>(); + Map<String, String> hostGroup1Configuration1 = new HashMap<>(); hostGroup1Configuration1.put("foo-type/hostGroup1Prop1", "prop1Value"); hostGroup1Configuration1.put("foo-type/hostGroup1Prop2", "prop2Value"); hostGroup1Configurations.add(hostGroup1Configuration1); // host group 2 - Map<String, Object> hostGroup2Properties = new HashMap<String, Object>(); + Map<String, Object> hostGroup2Properties = new HashMap<>(); hostGroups.add(hostGroup2Properties); hostGroup2Properties.put("name", "group2"); hostGroup2Properties.put("host_count", "5"); @@ -530,18 +530,18 @@ public class ProvisionClusterRequestTest { // host group 2 scoped configuration // version 2 configuration syntax - Collection<Map<String, String>> hostGroup2Configurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup2Configurations = new ArrayList<>(); hostGroup2Properties.put("configurations", hostGroup2Configurations); - Map<String, String> hostGroup2Configuration1 = new HashMap<String, String>(); + Map<String, String> hostGroup2Configuration1 = new HashMap<>(); hostGroup2Configuration1.put("foo-type/properties/hostGroup2Prop1", "prop1Value"); hostGroup2Configuration1.put("foo-type/properties_attributes/attribute1/hostGroup2Prop10", "attribute1Prop10-value"); hostGroup2Configurations.add(hostGroup2Configuration1); // cluster scoped configuration - Collection<Map<String, String>> clusterConfigurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> clusterConfigurations = new ArrayList<>(); properties.put("configurations", clusterConfigurations); - Map<String, String> clusterConfigurationProperties = new HashMap<String, String>(); + Map<String, String> clusterConfigurationProperties = new HashMap<>(); clusterConfigurations.add(clusterConfigurationProperties); clusterConfigurationProperties.put("someType/properties/property1", "someValue"); clusterConfigurationProperties.put("someType/properties_attributes/attribute1/property1", "someAttributePropValue"); @@ -550,37 +550,37 @@ public class ProvisionClusterRequestTest { } public static Map<String, Object> createBlueprintRequestPropertiesNameOnly(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); - Collection<Map<String, Object>> hostGroups = new ArrayList<Map<String, Object>>(); + Collection<Map<String, Object>> hostGroups = new ArrayList<>(); properties.put("host_groups", hostGroups); // host group 1 - Map<String, Object> hostGroup1Properties = new HashMap<String, Object>(); + Map<String, Object> hostGroup1Properties = new HashMap<>(); hostGroups.add(hostGroup1Properties); hostGroup1Properties.put("name", "group1"); - Collection<Map<String, String>> hostGroup1Hosts = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup1Hosts = new ArrayList<>(); hostGroup1Properties.put("hosts", hostGroup1Hosts); - Map<String, String> hostGroup1HostProperties = new HashMap<String, String>(); + Map<String, String> hostGroup1HostProperties = new HashMap<>(); hostGroup1HostProperties.put("fqdn", "host1.myDomain.com"); hostGroup1Hosts.add(hostGroup1HostProperties); // host group 1 scoped configuration // version 1 configuration syntax - Collection<Map<String, String>> hostGroup1Configurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup1Configurations = new ArrayList<>(); hostGroup1Properties.put("configurations", hostGroup1Configurations); - Map<String, String> hostGroup1Configuration1 = new HashMap<String, String>(); + Map<String, String> hostGroup1Configuration1 = new HashMap<>(); hostGroup1Configuration1.put("foo-type/hostGroup1Prop1", "prop1Value"); hostGroup1Configuration1.put("foo-type/hostGroup1Prop2", "prop2Value"); hostGroup1Configurations.add(hostGroup1Configuration1); // cluster scoped configuration - Collection<Map<String, String>> clusterConfigurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> clusterConfigurations = new ArrayList<>(); properties.put("configurations", clusterConfigurations); - Map<String, String> clusterConfigurationProperties = new HashMap<String, String>(); + Map<String, String> clusterConfigurationProperties = new HashMap<>(); clusterConfigurations.add(clusterConfigurationProperties); clusterConfigurationProperties.put("someType/properties/property1", "someValue"); clusterConfigurationProperties.put("someType/properties_attributes/attribute1/property1", "someAttributePropValue"); @@ -589,16 +589,16 @@ public class ProvisionClusterRequestTest { } public static Map<String, Object> createBlueprintRequestPropertiesCountOnly(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); - Collection<Map<String, Object>> hostGroups = new ArrayList<Map<String, Object>>(); + Collection<Map<String, Object>> hostGroups = new ArrayList<>(); properties.put("host_groups", hostGroups); // host group 2 - Map<String, Object> hostGroup2Properties = new HashMap<String, Object>(); + Map<String, Object> hostGroup2Properties = new HashMap<>(); hostGroups.add(hostGroup2Properties); hostGroup2Properties.put("name", "group2"); // count with no predicate @@ -606,18 +606,18 @@ public class ProvisionClusterRequestTest { // host group 2 scoped configuration // version 2 configuration syntax - Collection<Map<String, String>> hostGroup2Configurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> hostGroup2Configurations = new ArrayList<>(); hostGroup2Properties.put("configurations", hostGroup2Configurations); - Map<String, String> hostGroup2Configuration1 = new HashMap<String, String>(); + Map<String, String> hostGroup2Configuration1 = new HashMap<>(); hostGroup2Configuration1.put("foo-type/properties/hostGroup2Prop1", "prop1Value"); hostGroup2Configuration1.put("foo-type/properties_attributes/attribute1/hostGroup2Prop10", "attribute1Prop10-value"); hostGroup2Configurations.add(hostGroup2Configuration1); // cluster scoped configuration - Collection<Map<String, String>> clusterConfigurations = new ArrayList<Map<String, String>>(); + Collection<Map<String, String>> clusterConfigurations = new ArrayList<>(); properties.put("configurations", clusterConfigurations); - Map<String, String> clusterConfigurationProperties = new HashMap<String, String>(); + Map<String, String> clusterConfigurationProperties = new HashMap<>(); clusterConfigurations.add(clusterConfigurationProperties); clusterConfigurationProperties.put("someType/properties/property1", "someValue"); clusterConfigurationProperties.put("someType/properties_attributes/attribute1/property1", "someAttributePropValue"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QueryResponseImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QueryResponseImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QueryResponseImplTest.java index 84577ae..d2fc476 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QueryResponseImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/QueryResponseImplTest.java @@ -33,7 +33,7 @@ public class QueryResponseImplTest { @Test public void testGetResources() throws Exception { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); resources.add(new ResourceImpl(Resource.Type.Stage)); QueryResponse queryResponse = new QueryResponseImpl(resources); @@ -42,7 +42,7 @@ public class QueryResponseImplTest { @Test public void testIsSortedResponse() throws Exception { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); resources.add(new ResourceImpl(Resource.Type.Stage)); QueryResponse queryResponse = new QueryResponseImpl(resources); @@ -57,7 +57,7 @@ public class QueryResponseImplTest { @Test public void testIsPagedResponse() throws Exception { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); resources.add(new ResourceImpl(Resource.Type.Stage)); QueryResponse queryResponse = new QueryResponseImpl(resources); @@ -72,7 +72,7 @@ public class QueryResponseImplTest { @Test public void testGetTotalResourceCount() throws Exception { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); resources.add(new ResourceImpl(Resource.Type.Stage)); QueryResponse queryResponse = new QueryResponseImpl(resources); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java index 65e122a..0b8fa48 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProviderTest.java @@ -61,7 +61,7 @@ public class RemoteClusterResourceProviderTest { @Test public void testToResource() throws Exception { RemoteClusterResourceProvider provider = new RemoteClusterResourceProvider(); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RemoteClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID); propertyIds.add(RemoteClusterResourceProvider.CLUSTER_URL_PROPERTY_ID); propertyIds.add(RemoteClusterResourceProvider.USERNAME_PROPERTY_ID); @@ -74,7 +74,7 @@ public class RemoteClusterResourceProviderTest { RemoteAmbariClusterServiceEntity service2 = createNiceMock(RemoteAmbariClusterServiceEntity.class); expect(service2.getServiceName()).andReturn("service2").once(); - List<RemoteAmbariClusterServiceEntity> serviceList = new ArrayList<RemoteAmbariClusterServiceEntity>(); + List<RemoteAmbariClusterServiceEntity> serviceList = new ArrayList<>(); serviceList.add(service1); serviceList.add(service2); @@ -86,7 +86,7 @@ public class RemoteClusterResourceProviderTest { replay(service1, service2, entity); - List<String> services = new ArrayList<String>(); + List<String> services = new ArrayList<>(); services.add("service1"); services.add("service2"); @@ -135,7 +135,7 @@ public class RemoteClusterResourceProviderTest { RemoteAmbariClusterServiceEntity service2 = createNiceMock(RemoteAmbariClusterServiceEntity.class); expect(service2.getServiceName()).andReturn("service2").once(); - List<RemoteAmbariClusterServiceEntity> serviceList = new ArrayList<RemoteAmbariClusterServiceEntity>(); + List<RemoteAmbariClusterServiceEntity> serviceList = new ArrayList<>(); serviceList.add(service1); serviceList.add(service2); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 3a7b19b..94e1a1e 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 @@ -58,7 +58,7 @@ public class RepositoryResourceProviderTest { VAL_REPO_ID, VAL_REPO_NAME, null, null, null); rr.setStackName(VAL_STACK_NAME); rr.setStackVersion(VAL_STACK_VERSION); - Set<RepositoryResponse> allResponse = new HashSet<RepositoryResponse>(); + Set<RepositoryResponse> allResponse = new HashSet<>(); allResponse.add(rr); // set expectations @@ -69,7 +69,7 @@ public class RepositoryResourceProviderTest { ResourceProvider provider = new RepositoryResourceProvider(managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RepositoryResourceProvider.REPOSITORY_STACK_NAME_PROPERTY_ID); propertyIds.add(RepositoryResourceProvider.REPOSITORY_STACK_VERSION_PROPERTY_ID); propertyIds.add(RepositoryResourceProvider.REPOSITORY_REPO_NAME_PROPERTY_ID); @@ -154,7 +154,7 @@ public class RepositoryResourceProviderTest { RepositoryResponse rr = new RepositoryResponse(VAL_BASE_URL, VAL_OS, VAL_REPO_ID, VAL_REPO_NAME, null, null ,null); - Set<RepositoryResponse> allResponse = new HashSet<RepositoryResponse>(); + Set<RepositoryResponse> allResponse = new HashSet<>(); allResponse.add(rr); // set expectations @@ -167,7 +167,7 @@ public class RepositoryResourceProviderTest { ResourceProvider provider = new RepositoryResourceProvider(managementController); // add the property map to a set for the request. - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RepositoryResourceProvider.REPOSITORY_BASE_URL_PROPERTY_ID, "http://garbage.eu.co";); // create the request http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java index 0230a97..21f9383 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java @@ -89,7 +89,7 @@ public class RepositoryVersionResourceProviderTest { private static String jsonStringRedhat7 = "[{\"OperatingSystems\":{\"os_type\":\"redhat7\"},\"repositories\":[]}]"; private List<ClusterVersionEntity> getNoClusterVersions() { - final List<ClusterVersionEntity> emptyList = new ArrayList<ClusterVersionEntity>(); + final List<ClusterVersionEntity> emptyList = new ArrayList<>(); return emptyList; } @@ -98,7 +98,7 @@ public class RepositoryVersionResourceProviderTest { cluster.setClusterName("c1"); cluster.setClusterId(1L); - final List<ClusterVersionEntity> clusterVersions = new ArrayList<ClusterVersionEntity>(); + final List<ClusterVersionEntity> clusterVersions = new ArrayList<>(); final RepositoryVersionEntity repositoryVersion = new RepositoryVersionEntity(); repositoryVersion.setId(1L); final ClusterVersionEntity installFailedVersion = new ClusterVersionEntity(); @@ -113,7 +113,7 @@ public class RepositoryVersionResourceProviderTest { @Before public void before() throws Exception { final Set<String> validVersions = Sets.newHashSet("1.1", "1.1-17", "1.1.1.1", "1.1.343432.2", "1.1.343432.2-234234324"); - final Set<StackInfo> stacks = new HashSet<StackInfo>(); + final Set<StackInfo> stacks = new HashSet<>(); final AmbariMetaInfo ambariMetaInfo = Mockito.mock(AmbariMetaInfo.class); clusterVersionDAO = Mockito.mock(ClusterVersionDAO.class); @@ -131,7 +131,7 @@ public class RepositoryVersionResourceProviderTest { final StackInfo stackInfo = new StackInfo() { @Override public Map<String, UpgradePack> getUpgradePacks() { - final Map<String, UpgradePack> map = new HashMap<String, UpgradePack>(); + final Map<String, UpgradePack> map = new HashMap<>(); final UpgradePack pack1 = new UpgradePack() { @Override public String getName() { @@ -194,7 +194,7 @@ public class RepositoryVersionResourceProviderTest { }); - final HashSet<OperatingSystemInfo> osInfos = new HashSet<OperatingSystemInfo>(); + final HashSet<OperatingSystemInfo> osInfos = new HashSet<>(); osInfos.add(new OperatingSystemInfo("redhat6")); osInfos.add(new OperatingSystemInfo("redhat7")); Mockito.when(ambariMetaInfo.getOperatingSystems(Mockito.anyString(), Mockito.anyString())).thenAnswer(new Answer<Set<OperatingSystemInfo>>() { @@ -207,7 +207,7 @@ public class RepositoryVersionResourceProviderTest { if (stack.equals("HDP") && validVersions.contains(version)) { return osInfos; } else { - return new HashSet<OperatingSystemInfo>(); + return new HashSet<>(); } } }); @@ -257,8 +257,8 @@ public class RepositoryVersionResourceProviderTest { final ResourceProvider provider = injector.getInstance(ResourceProviderFactory.class).getRepositoryVersionResourceProvider(); - final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); - final Map<String, Object> properties = new LinkedHashMap<String, Object>(); + final Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); + final Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); @@ -421,8 +421,8 @@ public class RepositoryVersionResourceProviderTest { final ResourceProvider provider = injector.getInstance(ResourceProviderFactory.class).getRepositoryVersionResourceProvider(); - final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); - final Map<String, Object> properties = new LinkedHashMap<String, Object>(); + final Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); + final Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"1\",\"Repositories/unique\":\"true\"}]}]", Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); @@ -469,8 +469,8 @@ public class RepositoryVersionResourceProviderTest { } }); - final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); - final Map<String, Object> properties = new LinkedHashMap<String, Object>(); + final Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); + final Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]";, Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); @@ -553,8 +553,8 @@ public class RepositoryVersionResourceProviderTest { } }); - final Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); - final Map<String, Object> properties = new LinkedHashMap<String, Object>(); + final Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); + final Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID, "name"); properties.put(RepositoryVersionResourceProvider.SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID, new Gson().fromJson("[{\"OperatingSystems/os_type\":\"redhat6\",\"repositories\":[{\"Repositories/repo_id\":\"1\",\"Repositories/repo_name\":\"1\",\"Repositories/base_url\":\"http://example.com/repo1\",\"Repositories/unique\":\"true\"}]}]";, Object.class)); properties.put(RepositoryVersionResourceProvider.REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID, "HDP"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestOperationLevelTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestOperationLevelTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestOperationLevelTest.java index 696186c..99b8dee 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestOperationLevelTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestOperationLevelTest.java @@ -40,7 +40,7 @@ public class RequestOperationLevelTest { String hostcomponent_id = "Namenode"; String host_id = "host1"; - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); requestInfoProperties.put(RequestResourceProvider.COMMAND_ID, "RESTART"); requestInfoProperties.put(RequestOperationLevel.OPERATION_LEVEL_ID, http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 e6f2ed5..dc9e5ed 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 @@ -167,9 +167,9 @@ public class RequestResourceProviderTest { managementController); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); // add properties to the request map properties.put(RequestResourceProvider.REQUEST_ID_PROPERTY_ID, "Request100"); @@ -214,7 +214,7 @@ public class RequestResourceProviderTest { PropertyHelper.getPropertyIds(type), PropertyHelper.getKeyPropertyIds(type), managementController); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); Request request; Predicate predicate = new PredicateBuilder() .property(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID) @@ -282,7 +282,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -332,7 +332,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -385,7 +385,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -446,7 +446,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -513,7 +513,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); @@ -567,7 +567,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -638,7 +638,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -719,7 +719,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -769,10 +769,10 @@ public class RequestResourceProviderTest { Stage stage = createNiceMock(Stage.class); Clusters clusters = createNiceMock(Clusters.class); - List<HostRoleCommand> hostRoleCommands = new LinkedList<HostRoleCommand>(); + List<HostRoleCommand> hostRoleCommands = new LinkedList<>(); hostRoleCommands.add(hostRoleCommand); - Collection<Stage> stages = new HashSet<Stage>(); + Collection<Stage> stages = new HashSet<>(); stages.add(stage); org.apache.ambari.server.actionmanager.Request requestMock = @@ -803,7 +803,7 @@ public class RequestResourceProviderTest { // TEST CASE: Check update request validation (abort reason not specified) // add the property map to a set for the request. - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); // create the request Request request = PropertyHelper.getUpdateRequest(properties, null); Predicate predicate = new PredicateBuilder().property(RequestResourceProvider.REQUEST_ID_PROPERTY_ID). @@ -952,14 +952,14 @@ public class RequestResourceProviderTest { SecurityContextHolder.getContext().setAuthentication(authentication); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID, "c1"); - Set<Map<String, Object>> filterSet = new HashSet<Map<String, Object>>(); - Map<String, Object> filterMap = new HashMap<String, Object>(); + Set<Map<String, Object>> filterSet = new HashSet<>(); + Map<String, Object> filterMap = new HashMap<>(); filterMap.put(RequestResourceProvider.SERVICE_ID, "HDFS"); filterSet.add(filterMap); @@ -967,7 +967,7 @@ public class RequestResourceProviderTest { propertySet.add(properties); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); requestInfoProperties.put(RequestResourceProvider.COMMAND_ID, "HDFS_SERVICE_CHECK"); @@ -1048,14 +1048,14 @@ public class RequestResourceProviderTest { SecurityContextHolder.getContext().setAuthentication(authentication); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID, "c1"); - Set<Map<String, Object>> filterSet = new HashSet<Map<String, Object>>(); - Map<String, Object> filterMap = new HashMap<String, Object>(); + Set<Map<String, Object>> filterSet = new HashSet<>(); + Map<String, Object> filterMap = new HashMap<>(); filterMap.put(RequestResourceProvider.SERVICE_ID, "HDFS"); filterMap.put(RequestResourceProvider.HOSTS_ID, "host1,host2,host3"); filterSet.add(filterMap); @@ -1064,7 +1064,7 @@ public class RequestResourceProviderTest { propertySet.add(properties); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); requestInfoProperties.put("parameters/param1", "value1"); requestInfoProperties.put("parameters/param2", "value2"); @@ -1157,15 +1157,15 @@ public class RequestResourceProviderTest { TestAuthenticationFactory.createAdministrator()); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID, "c1"); - Set<Map<String, Object>> filterSet = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> filterSet = new HashSet<>(); String predicateProperty = HOST_COMPONENT_STALE_CONFIGS_PROPERTY_ID + "=true"; - Map<String, Object> filterMap = new HashMap<String, Object>(); + Map<String, Object> filterMap = new HashMap<>(); filterMap.put(RequestResourceProvider.HOSTS_PREDICATE, predicateProperty); filterSet.add(filterMap); @@ -1173,7 +1173,7 @@ public class RequestResourceProviderTest { propertySet.add(properties); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); requestInfoProperties.put(RequestResourceProvider.COMMAND_ID, "RESTART"); requestInfoProperties.put(RequestResourceProvider.REQUEST_CONTEXT_ID, "Restart All with Stale Configs"); @@ -1255,9 +1255,9 @@ public class RequestResourceProviderTest { SecurityContextHolder.getContext().setAuthentication(authentication); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); String c1 = "c1"; String host_component = "HOST_COMPONENT"; @@ -1267,8 +1267,8 @@ public class RequestResourceProviderTest { properties.put(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID, c1); - Set<Map<String, Object>> filterSet = new HashSet<Map<String, Object>>(); - Map<String, Object> filterMap = new HashMap<String, Object>(); + Set<Map<String, Object>> filterSet = new HashSet<>(); + Map<String, Object> filterMap = new HashMap<>(); filterMap.put(RequestResourceProvider.SERVICE_ID, service_id); filterMap.put(RequestResourceProvider.HOSTS_ID, host_name); filterSet.add(filterMap); @@ -1277,7 +1277,7 @@ public class RequestResourceProviderTest { propertySet.add(properties); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); requestInfoProperties.put(RequestResourceProvider.COMMAND_ID, "RESTART"); requestInfoProperties.put(RequestOperationLevel.OPERATION_LEVEL_ID, @@ -1460,12 +1460,12 @@ public class RequestResourceProviderTest { replay(managementController, metaInfo, actionDefinition, response, cluster, clusters); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); - Set<Map<String, Object>> filterSet = new HashSet<Map<String, Object>>(); - Map<String, Object> filterMap = new HashMap<String, Object>(); + Set<Map<String, Object>> filterSet = new HashSet<>(); + Map<String, Object> filterMap = new HashMap<>(); filterMap.put(RequestResourceProvider.HOSTS_ID, "h1,h2"); filterSet.add(filterMap); @@ -1473,7 +1473,7 @@ public class RequestResourceProviderTest { properties.put(RequestResourceProvider.REQUEST_CLUSTER_NAME_PROPERTY_ID, clusterName); propertySet.add(properties); - Map<String, String> requestInfoProperties = new HashMap<String, String>(); + Map<String, String> requestInfoProperties = new HashMap<>(); if(commandName != null) { requestInfoProperties.put(RequestResourceProvider.COMMAND_ID, commandName); } @@ -1547,7 +1547,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); @@ -1601,7 +1601,7 @@ public class RequestResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestResourceProvider.REQUEST_ID_PROPERTY_ID); propertyIds.add(RequestResourceProvider.REQUEST_STATUS_PROPERTY_ID); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java index e3fec23..25c4846 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java @@ -105,8 +105,8 @@ public class RequestScheduleResourceProviderTest { RequestScheduleResourceProvider resourceProvider = getResourceProvider (managementController); - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); @@ -121,16 +121,16 @@ public class RequestScheduleResourceProviderTest { properties.put(RequestScheduleResourceProvider .SCHEDULE_DAYS_OF_MONTH_PROPERTY_ID, "*"); - HashSet<Map<String, Object>> batch = new HashSet<Map<String, Object>>(); - Map<String, Object> batchSettings = new HashMap<String, Object>(); + HashSet<Map<String, Object>> batch = new HashSet<>(); + Map<String, Object> batchSettings = new HashMap<>(); batchSettings.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_BATCH_SEPARATION_PROPERTY_ID, "15"); - Map<String, Object> batchRequests = new HashMap<String, Object>(); - HashSet<Map<String, Object>> requestSet = new HashSet<Map<String, Object>>(); + Map<String, Object> batchRequests = new HashMap<>(); + HashSet<Map<String, Object>> requestSet = new HashSet<>(); - Map<String, Object> request1 = new HashMap<String, Object>(); - Map<String, Object> request2 = new HashMap<String, Object>(); + Map<String, Object> request1 = new HashMap<>(); + Map<String, Object> request2 = new HashMap<>(); request1.put(RequestScheduleResourceProvider .BATCH_REQUEST_TYPE_PROPERTY_ID, BatchRequest.Type.PUT.name()); @@ -215,8 +215,7 @@ public class RequestScheduleResourceProviderTest { expect(cluster.getAllRequestExecutions()).andStubAnswer(new IAnswer<Map<Long, RequestExecution>>() { @Override public Map<Long, RequestExecution> answer() throws Throwable { - Map<Long, RequestExecution> requestExecutionMap = new HashMap<Long, - RequestExecution>(); + Map<Long, RequestExecution> requestExecutionMap = new HashMap<>(); requestExecutionMap.put(requestExecution.getId(), requestExecution); return requestExecutionMap; } @@ -228,7 +227,7 @@ public class RequestScheduleResourceProviderTest { RequestScheduleResourceProvider resourceProvider = getResourceProvider (managementController); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); @@ -243,16 +242,16 @@ public class RequestScheduleResourceProviderTest { properties.put(RequestScheduleResourceProvider .SCHEDULE_DAYS_OF_MONTH_PROPERTY_ID, "*"); - HashSet<Map<String, Object>> batch = new HashSet<Map<String, Object>>(); - Map<String, Object> batchSettings = new HashMap<String, Object>(); + HashSet<Map<String, Object>> batch = new HashSet<>(); + Map<String, Object> batchSettings = new HashMap<>(); batchSettings.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_BATCH_SEPARATION_PROPERTY_ID, "15"); - Map<String, Object> batchRequests = new HashMap<String, Object>(); - HashSet<Map<String, Object>> requestSet = new HashSet<Map<String, Object>>(); + Map<String, Object> batchRequests = new HashMap<>(); + HashSet<Map<String, Object>> requestSet = new HashSet<>(); - Map<String, Object> request1 = new HashMap<String, Object>(); - Map<String, Object> request2 = new HashMap<String, Object>(); + Map<String, Object> request1 = new HashMap<>(); + Map<String, Object> request2 = new HashMap<>(); request1.put(RequestScheduleResourceProvider .BATCH_REQUEST_TYPE_PROPERTY_ID, BatchRequest.Type.PUT.name()); @@ -282,7 +281,7 @@ public class RequestScheduleResourceProviderTest { properties.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_BATCH_PROPERTY_ID, batch); - Map<String, String> mapRequestProps = new HashMap<String, String>(); + Map<String, String> mapRequestProps = new HashMap<>(); mapRequestProps.put("context", "Called from a test"); Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps); @@ -325,8 +324,7 @@ public class RequestScheduleResourceProviderTest { expect(cluster.getAllRequestExecutions()).andStubAnswer(new IAnswer<Map<Long, RequestExecution>>() { @Override public Map<Long, RequestExecution> answer() throws Throwable { - Map<Long, RequestExecution> requestExecutionMap = new HashMap<Long, - RequestExecution>(); + Map<Long, RequestExecution> requestExecutionMap = new HashMap<>(); requestExecutionMap.put(requestExecution.getId(), requestExecution); return requestExecutionMap; } @@ -338,14 +336,14 @@ public class RequestScheduleResourceProviderTest { RequestScheduleResourceProvider resourceProvider = getResourceProvider (managementController); - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); properties.put(RequestScheduleResourceProvider .REQUEST_SCHEDULE_DESC_PROPERTY_ID, "some description"); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RequestScheduleResourceProvider .REQUEST_SCHEDULE_CLUSTER_NAME_PROPERTY_ID); propertyIds.add(RequestScheduleResourceProvider @@ -390,8 +388,7 @@ public class RequestScheduleResourceProviderTest { ExecutionScheduleManager executionScheduleManager = createNiceMock (ExecutionScheduleManager.class); - Map<Long, RequestExecution> requestExecutionMap = new HashMap<Long, - RequestExecution>(); + Map<Long, RequestExecution> requestExecutionMap = new HashMap<>(); requestExecutionMap.put(1L, requestExecution); expect(managementController.getAuthName()).andReturn("admin").anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 aef60f3..f60915c 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 @@ -67,7 +67,7 @@ public class RequestStageContainerTest { Stage stage2 = createNiceMock(Stage.class); Stage stage3 = createNiceMock(Stage.class); - List<Stage> listStages = new ArrayList<Stage>(); + List<Stage> listStages = new ArrayList<>(); listStages.add(stage2); listStages.add(stage3); requestStages.addStages(listStages); @@ -85,7 +85,7 @@ public class RequestStageContainerTest { Stage stage1 = createNiceMock(Stage.class); Stage stage2 = createNiceMock(Stage.class); - List<Stage> listStages = new ArrayList<Stage>(); + List<Stage> listStages = new ArrayList<>(); listStages.add(stage1); listStages.add(stage2); @@ -109,7 +109,7 @@ public class RequestStageContainerTest { HostRoleCommand command2 = createNiceMock(HostRoleCommand.class); HostRoleCommand command3 = createNiceMock(HostRoleCommand.class); - List<Stage> stages = new ArrayList<Stage>(); + List<Stage> stages = new ArrayList<>(); stages.add(stage1); stages.add(stage2); stages.add(stage3); @@ -138,7 +138,7 @@ public class RequestStageContainerTest { Request request = createStrictMock(Request.class); Stage stage1 = createNiceMock(Stage.class); Stage stage2 = createNiceMock(Stage.class); - List<Stage> stages = new ArrayList<Stage>(); + List<Stage> stages = new ArrayList<>(); stages.add(stage1); stages.add(stage2); @@ -176,12 +176,12 @@ public class RequestStageContainerTest { Stage stage2 = createNiceMock(Stage.class); HostRoleCommand command1 = createNiceMock(HostRoleCommand.class); Role role = createNiceMock(Role.class); - List<Stage> stages = new ArrayList<Stage>(); + List<Stage> stages = new ArrayList<>(); RoleCommand roleCommand = RoleCommand.INSTALL; HostRoleStatus status = HostRoleStatus.IN_PROGRESS; stages.add(stage1); stages.add(stage2); - List<HostRoleCommand> hostRoleCommands = new ArrayList<HostRoleCommand>(); + List<HostRoleCommand> hostRoleCommands = new ArrayList<>(); hostRoleCommands.add(command1); expect(actionManager.getRequestTasks(100)).andReturn(hostRoleCommands); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java index a8e603b..dcaa61b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java @@ -82,7 +82,7 @@ public class RoleAuthorizationResourceProviderTest extends EasyMockSupport { expect(roleAuthorizationEntity.getAuthorizationId()).andReturn("TEST.DO_SOMETHING"); expect(roleAuthorizationEntity.getAuthorizationName()).andReturn("Do Something"); - List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<RoleAuthorizationEntity>(); + List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<>(); authorizationEntities.add(roleAuthorizationEntity); RoleAuthorizationDAO roleAuthorizationDAO = injector.getInstance(RoleAuthorizationDAO.class); @@ -112,7 +112,7 @@ public class RoleAuthorizationResourceProviderTest extends EasyMockSupport { expect(roleAuthorizationEntity.getAuthorizationId()).andReturn("TEST.DO_SOMETHING").once(); expect(roleAuthorizationEntity.getAuthorizationName()).andReturn("Do Something").once(); - List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<RoleAuthorizationEntity>(); + List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<>(); authorizationEntities.add(roleAuthorizationEntity); PermissionEntity permissionEntry = createStrictMock(PermissionEntity.class); @@ -152,7 +152,7 @@ public class RoleAuthorizationResourceProviderTest extends EasyMockSupport { expect(roleAuthorizationEntity2.getAuthorizationId()).andReturn("TEST.DO_SOMETHING_ELSE").anyTimes(); expect(roleAuthorizationEntity2.getAuthorizationName()).andReturn("Do Something Else").anyTimes(); - List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<RoleAuthorizationEntity>(); + List<RoleAuthorizationEntity> authorizationEntities = new ArrayList<>(); authorizationEntities.add(roleAuthorizationEntity1); authorizationEntities.add(roleAuthorizationEntity2); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 1f4f4ca..6be5142 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 @@ -67,7 +67,7 @@ public class RootServiceComponentPropertyProviderTest { resource.setProperty(RootServiceComponentResourceProvider.COMPONENT_NAME_PROPERTY_ID, componentName); resource.setProperty(RootServiceComponentResourceProvider.SERVICE_NAME_PROPERTY_ID, RootServiceResponseFactory.Services.AMBARI.name()); - HashSet<String> requestIds = new HashSet<String>(); + HashSet<String> requestIds = new HashSet<>(); if (requestCiphers) { requestIds.add(RootServiceComponentPropertyProvider.CIPHER_PROPERTIES_PROPERTY_ID); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 265206e..eb6f08e 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 @@ -49,13 +49,13 @@ public class RootServiceComponentResourceProviderTest { AmbariManagementController managementController = createMock(AmbariManagementController.class); - Set<RootServiceComponentResponse> allResponse = new HashSet<RootServiceComponentResponse>(); + Set<RootServiceComponentResponse> allResponse = new HashSet<>(); allResponse.add(new RootServiceComponentResponse("component1", "1.1.1", Collections.<String,String>emptyMap())); allResponse.add(new RootServiceComponentResponse("component2", "1.1.1", Collections.<String,String>emptyMap())); allResponse.add(new RootServiceComponentResponse("component3", "1.1.1", Collections.<String,String>emptyMap())); allResponse.add(new RootServiceComponentResponse(RootServiceResponseFactory.Components.AMBARI_SERVER.name(), "1.1.1", Collections.<String,String>emptyMap())); - Set<RootServiceComponentResponse> nameResponse = new HashSet<RootServiceComponentResponse>(); + Set<RootServiceComponentResponse> nameResponse = new HashSet<>(); nameResponse.add(new RootServiceComponentResponse("component4", "1.1.1", Collections.<String,String>emptyMap())); @@ -71,7 +71,7 @@ public class RootServiceComponentResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RootServiceComponentResourceProvider.SERVICE_NAME_PROPERTY_ID); propertyIds.add(RootServiceComponentResourceProvider.COMPONENT_NAME_PROPERTY_ID); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 9ce2b7b..f15c9f2 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 @@ -65,13 +65,13 @@ public class RootServiceHostComponentResourceProviderTest { AbstractRootServiceResponseFactory factory = createNiceMock(AbstractRootServiceResponseFactory.class); - List<Host> hosts = new LinkedList<Host>(); + List<Host> hosts = new LinkedList<>(); hosts.add(host1); - Set<Cluster> clusterSet = new HashSet<Cluster>(); + Set<Cluster> clusterSet = new HashSet<>(); clusterSet.add(cluster); - Set<RootServiceHostComponentResponse> responseSet = new HashSet<RootServiceHostComponentResponse>(); + Set<RootServiceHostComponentResponse> responseSet = new HashSet<>(); responseSet.add(response); // set expectations @@ -110,7 +110,7 @@ public class RootServiceHostComponentResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RootServiceHostComponentResourceProvider.SERVICE_NAME_PROPERTY_ID); propertyIds.add(RootServiceHostComponentResourceProvider.HOST_NAME_PROPERTY_ID); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 f59cc90..13b2841 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 @@ -47,12 +47,12 @@ public class RootServiceResourceProviderTest { AmbariManagementController managementController = createMock(AmbariManagementController.class); - Set<RootServiceResponse> allResponse = new HashSet<RootServiceResponse>(); + Set<RootServiceResponse> allResponse = new HashSet<>(); allResponse.add(new RootServiceResponse("service1")); allResponse.add(new RootServiceResponse("service2")); allResponse.add(new RootServiceResponse("service3")); - Set<RootServiceResponse> nameResponse = new HashSet<RootServiceResponse>(); + Set<RootServiceResponse> nameResponse = new HashSet<>(); nameResponse.add(new RootServiceResponse("service4")); @@ -68,7 +68,7 @@ public class RootServiceResourceProviderTest { PropertyHelper.getKeyPropertyIds(type), managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(RootServiceResourceProvider.SERVICE_NAME_PROPERTY_ID); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 972ea7d..48d1351 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 @@ -134,7 +134,7 @@ public class ScaleClusterRequestTest { reset(hostResourceProvider); replay(hostResourceProvider); - Set<Map<String, Object>> propertySet = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new HashSet<>(); propertySet.add(createScaleClusterPropertiesGroup1_HostName(CLUSTER_NAME, BLUEPRINT_NAME)); propertySet.add(createScaleClusterPropertiesGroup1_HostName2(CLUSTER_NAME, BLUEPRINT_NAME)); @@ -239,7 +239,7 @@ public class ScaleClusterRequestTest { @Test public void testMultipleHostGroups() throws Exception { - Set<Map<String, Object>> propertySet = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new HashSet<>(); propertySet.add(createScaleClusterPropertiesGroup1_HostCountAndPredicate(CLUSTER_NAME, BLUEPRINT_NAME)); propertySet.add(createScaleClusterPropertiesGroup1_HostCount(CLUSTER_NAME, BLUEPRINT_NAME)); propertySet.add(createScaleClusterPropertiesGroup1_HostName(CLUSTER_NAME, BLUEPRINT_NAME)); @@ -328,7 +328,7 @@ public class ScaleClusterRequestTest { reset(hostResourceProvider); replay(hostResourceProvider); - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); propertySet.add(createScaleClusterPropertiesGroup1_HostName(CLUSTER_NAME, BLUEPRINT_NAME)); propertySet.add(createScaleClusterPropertiesGroup1_HostName2(CLUSTER_NAME, "OTHER_BLUEPRINT")); @@ -337,7 +337,7 @@ public class ScaleClusterRequestTest { } public static Map<String, Object> createScaleClusterPropertiesGroup1_HostName(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); @@ -348,7 +348,7 @@ public class ScaleClusterRequestTest { } public static Map<String, Object> createScaleClusterPropertiesGroup1_HostCount(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); @@ -359,7 +359,7 @@ public class ScaleClusterRequestTest { } public static Map<String, Object> createScaleClusterPropertiesGroup1_HostCountAndPredicate(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); @@ -371,7 +371,7 @@ public class ScaleClusterRequestTest { } public static Map<String, Object> createScaleClusterPropertiesGroup1_HostCount2(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); @@ -382,7 +382,7 @@ public class ScaleClusterRequestTest { } public static Map<String, Object> createScaleClusterPropertiesGroup1_HostName2(String clusterName, String blueprintName) { - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName); properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java index 19a7467..aef29dd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java @@ -48,7 +48,7 @@ import junit.framework.Assert; */ public class SchemaImplTest { - private static final Set<String> resourceProviderProperties = new HashSet<String>(); + private static final Set<String> resourceProviderProperties = new HashSet<>(); static { resourceProviderProperties.add(PropertyHelper.getPropertyId("c1", "p1")); @@ -87,7 +87,7 @@ public class SchemaImplTest { @Override public Set<String> checkPropertyIds(Set<String> propertyIds) { if (!resourceProviderProperties.containsAll(propertyIds)) { - Set<String> unsupportedPropertyIds = new HashSet<String>(propertyIds); + Set<String> unsupportedPropertyIds = new HashSet<>(propertyIds); unsupportedPropertyIds.removeAll(resourceProviderProperties); return unsupportedPropertyIds; } @@ -95,7 +95,7 @@ public class SchemaImplTest { } }; - private static final Set<String> propertyProviderProperties = new HashSet<String>(); + private static final Set<String> propertyProviderProperties = new HashSet<>(); static { propertyProviderProperties.add(PropertyHelper.getPropertyId("c3", "p5")); @@ -113,7 +113,7 @@ public class SchemaImplTest { @Override public Set<String> checkPropertyIds(Set<String> propertyIds) { if (!propertyProviderProperties.containsAll(propertyIds)) { - Set<String> unsupportedPropertyIds = new HashSet<String>(propertyIds); + Set<String> unsupportedPropertyIds = new HashSet<>(propertyIds); unsupportedPropertyIds.removeAll(propertyProviderProperties); return unsupportedPropertyIds; } @@ -121,13 +121,13 @@ public class SchemaImplTest { } }; - private static final List<PropertyProvider> propertyProviders = new LinkedList<PropertyProvider>(); + private static final List<PropertyProvider> propertyProviders = new LinkedList<>(); static { propertyProviders.add(propertyProvider); } - private static final Map<Resource.Type, String> keyPropertyIds = new HashMap<Resource.Type, String>(); + private static final Map<Resource.Type, String> keyPropertyIds = new HashMap<>(); static { keyPropertyIds.put(Resource.Type.Cluster, PropertyHelper.getPropertyId("c1", "p1")); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/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 994f221..44c2493 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 @@ -142,10 +142,10 @@ public class ServiceResourceProviderTest { ResourceProvider provider = getServiceProvider(managementController); // add the property map to a set for the request. add more maps for multiple creates - Set<Map<String, Object>> propertySet = new LinkedHashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertySet = new LinkedHashSet<>(); // Service 1: create a map of properties for the request - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); // add properties to the request map properties.put(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID, "Cluster100"); @@ -197,7 +197,7 @@ public class ServiceResourceProviderTest { ServiceFactory serviceFactory = createNiceMock(ServiceFactory.class); AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); - Map<String, Service> allResponseMap = new HashMap<String, Service>(); + Map<String, Service> allResponseMap = new HashMap<>(); allResponseMap.put("Service100", service0); allResponseMap.put("Service101", service1); allResponseMap.put("Service102", service2); @@ -254,7 +254,7 @@ public class ServiceResourceProviderTest { ResourceProvider provider = getServiceProvider(managementController); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID); propertyIds.add(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID); @@ -265,7 +265,7 @@ public class ServiceResourceProviderTest { Set<Resource> resources = provider.getResources(request, predicate); Assert.assertEquals(5, resources.size()); - Set<String> names = new HashSet<String>(); + Set<String> names = new HashSet<>(); for (Resource resource : resources) { String clusterName = (String) resource.getPropertyValue(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID); Assert.assertEquals("Cluster100", clusterName); @@ -292,7 +292,7 @@ public class ServiceResourceProviderTest { resources = provider.getResources(request, predicate); Assert.assertEquals(3, resources.size()); - names = new HashSet<String>(); + names = new HashSet<>(); for (Resource resource : resources) { String clusterName = (String) resource.getPropertyValue(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID); Assert.assertEquals("Cluster100", clusterName); @@ -319,7 +319,7 @@ public class ServiceResourceProviderTest { AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); KerberosHelper kerberosHeper = createStrictMock(KerberosHelper.class); - Map<String, Service> allResponseMap = new HashMap<String, Service>(); + Map<String, Service> allResponseMap = new HashMap<>(); allResponseMap.put("KERBEROS", service0); // set expectations @@ -387,7 +387,7 @@ public class ServiceResourceProviderTest { AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); KerberosHelper kerberosHelper = createStrictMock(KerberosHelper.class); - Map<String, Service> allResponseMap = new HashMap<String, Service>(); + Map<String, Service> allResponseMap = new HashMap<>(); allResponseMap.put("KERBEROS", service0); // set expectations @@ -454,7 +454,7 @@ public class ServiceResourceProviderTest { AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); KerberosHelper kerberosHeper = createStrictMock(KerberosHelper.class); - Map<String, Service> allResponseMap = new HashMap<String, Service>(); + Map<String, Service> allResponseMap = new HashMap<>(); allResponseMap.put("KERBEROS", service0); // set expectations @@ -523,7 +523,7 @@ public class ServiceResourceProviderTest { AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class); KerberosHelper kerberosHeper = createStrictMock(KerberosHelper.class); - Map<String, Service> allResponseMap = new HashMap<String, Service>(); + Map<String, Service> allResponseMap = new HashMap<>(); allResponseMap.put("KERBEROS", service0); // set expectations @@ -608,7 +608,7 @@ public class ServiceResourceProviderTest { StackId stackId = createNiceMock(StackId.class); ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class); - Map<String, String> mapRequestProps = new HashMap<String, String>(); + Map<String, String> mapRequestProps = new HashMap<>(); mapRequestProps.put("context", "Called from a test"); // set expectations @@ -663,7 +663,7 @@ public class ServiceResourceProviderTest { ServiceResourceProvider provider = getServiceProvider(managementController, maintenanceStateHelper); // add the property map to a set for the request. - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(ServiceResourceProvider.SERVICE_SERVICE_STATE_PROPERTY_ID, "STARTED"); @@ -716,7 +716,7 @@ public class ServiceResourceProviderTest { StackId stackId = createNiceMock(StackId.class); ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class); - Map<String, String> mapRequestProps = new HashMap<String, String>(); + Map<String, String> mapRequestProps = new HashMap<>(); mapRequestProps.put("context", "Called from a test"); // set expectations @@ -797,7 +797,7 @@ public class ServiceResourceProviderTest { ServiceResourceProvider provider2 = getServiceProvider(managementController2, maintenanceStateHelper); // add the property map to a set for the request. - Map<String, Object> properties = new LinkedHashMap<String, Object>(); + Map<String, Object> properties = new LinkedHashMap<>(); properties.put(ServiceResourceProvider.SERVICE_SERVICE_STATE_PROPERTY_ID, "STARTED"); @@ -943,7 +943,7 @@ public class ServiceResourceProviderTest { Cluster cluster = createNiceMock(Cluster.class); Service service = createNiceMock(Service.class); ServiceComponent sc = createNiceMock(ServiceComponent.class); - Map<String, ServiceComponent> scMap = new HashMap<String, ServiceComponent>(); + Map<String, ServiceComponent> scMap = new HashMap<>(); scMap.put("Component100", sc); State componentState = State.STARTED; ServiceComponentHost sch = createNiceMock(ServiceComponentHost.class); @@ -1022,7 +1022,7 @@ public class ServiceResourceProviderTest { TestComponent component2 = new TestComponent("Component101", createNiceMock(ServiceComponent.class), State.STARTED); TestComponent component3 = new TestComponent("Component102", createNiceMock(ServiceComponent.class), State.STARTED); - Map<String, ServiceComponent> scMap = new HashMap<String, ServiceComponent>(); + Map<String, ServiceComponent> scMap = new HashMap<>(); scMap.put(component1.Name, component1.Component); scMap.put(component2.Name, component2.Component); scMap.put(component3.Name, component3.Component); @@ -1108,7 +1108,7 @@ public class ServiceResourceProviderTest { @Test public void testCheckPropertyIds() throws Exception { - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add("foo"); propertyIds.add("cat1/foo"); propertyIds.add("cat2/bar"); @@ -1117,7 +1117,7 @@ public class ServiceResourceProviderTest { propertyIds.add("cat4/sub2/sub3/bat"); propertyIds.add("cat5/subcat5/map"); - Map<Resource.Type, String> keyPropertyIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> keyPropertyIds = new HashMap<>(); AmbariManagementController managementController = createMock(AmbariManagementController.class);
