http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java index c825497..3654386 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewInstanceResourceDefinition.java @@ -43,7 +43,7 @@ public class ViewInstanceResourceDefinition extends BaseResourceDefinition { super(Resource.Type.ViewInstance); this.subResourceDefinitions = subResourceDefinitions == null ? new HashSet<SubResourceDefinition>() : - new HashSet<SubResourceDefinition>(subResourceDefinitions); + new HashSet<>(subResourceDefinitions); this.subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.ViewPrivilege)); }
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java index f3df120..169af3b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ViewVersionResourceDefinition.java @@ -53,7 +53,7 @@ public class ViewVersionResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> subResourceDefinitions = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> subResourceDefinitions = new HashSet<>(); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.ViewInstance)); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.ViewPermission)); return subResourceDefinitions; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java index 8ba2618..365e9b3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/WorkflowResourceDefinition.java @@ -47,7 +47,7 @@ public class WorkflowResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.Job)); return setChildren; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java index 5672598..4aad530 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java @@ -133,8 +133,8 @@ public class BootStrapResource { private void normalizeHosts(SshHostInfo info) { - List<String> validHosts = new ArrayList<String>(); - List<String> newHosts = new ArrayList<String>(); + List<String> validHosts = new ArrayList<>(); + List<String> newHosts = new ArrayList<>(); for (String host: info.getHosts()) { try { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java index 40cd6e0..dd7c917 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutService.java @@ -68,7 +68,7 @@ public class ActiveWidgetLayoutService extends BaseService { } private ResourceInstance createResource(String widgetLayoutId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.User, StringUtils.lowerCase(userName)); return createResource(Resource.Type.ActiveWidgetLayout, mapIds); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java index e002c38..d3f88ec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java @@ -105,7 +105,7 @@ public class AlertDefinitionService extends BaseService { */ private ResourceInstance createResourceInstance(String clusterName, Long definitionId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.AlertDefinition, null == definitionId ? null : definitionId.toString()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java index a4bfcf3..97a61ba 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java @@ -110,7 +110,7 @@ public class AlertGroupService extends BaseService { private ResourceInstance createAlertGroupResource(String clusterName, Long groupId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.AlertGroup, null == groupId ? null : groupId.toString()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java index 4ebe1f6..6f7e2fa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java @@ -84,7 +84,7 @@ public class AlertHistoryService extends BaseService { */ private ResourceInstance createResourceInstance(String clusterName, Long historyId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Service, serviceName); mapIds.put(Resource.Type.Host, hostName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java index 26731fb..3a4cda6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java @@ -76,7 +76,7 @@ public class AlertNoticeService extends BaseService { */ private ResourceInstance createResourceInstance(String clusterName, Long alertNoticeId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); if (null != alertNoticeId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java index 184cbf1..babf42c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java @@ -81,7 +81,7 @@ public class AlertService extends BaseService { * @return the resource instance */ private ResourceInstance createResourceInstance(Long alertId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Service, serviceName); mapIds.put(Resource.Type.Host, hostName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java index 2e00491..3d995b3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java @@ -96,7 +96,7 @@ public class AlertTargetService extends BaseService { * @return the instance of the query. */ private ResourceInstance createAlertTargetResource(Long targetId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.AlertTarget, null == targetId ? null : targetId.toString()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java index 13f3b9a..9f1d988 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java @@ -267,7 +267,7 @@ public class AmbariMetaInfo { @Inject public void init() throws Exception { // Need to be initialized before all actions - ALL_SUPPORTED_OS = new ArrayList<String>(osFamily.os_list()); + ALL_SUPPORTED_OS = new ArrayList<>(osFamily.os_list()); readServerVersion(); @@ -385,7 +385,7 @@ public class AmbariMetaInfo { StackInfo stack = getStack(stackName, version); List<RepositoryInfo> repository = stack.getRepositories(); - Map<String, List<RepositoryInfo>> reposResult = new HashMap<String, List<RepositoryInfo>>(); + Map<String, List<RepositoryInfo>> reposResult = new HashMap<>(); for (RepositoryInfo repo : repository) { if (!reposResult.containsKey(repo.getOsType())) { reposResult.put(repo.getOsType(), @@ -402,7 +402,7 @@ public class AmbariMetaInfo { StackInfo stack = getStack(stackName, version); List<RepositoryInfo> repositories = stack.getRepositories(); - List<RepositoryInfo> repositoriesResult = new ArrayList<RepositoryInfo>(); + List<RepositoryInfo> repositoriesResult = new ArrayList<>(); for (RepositoryInfo repository : repositories) { if (repository.getOsType().equals(osType)) { repositoriesResult.add(repository); @@ -519,7 +519,7 @@ public class AmbariMetaInfo { */ public Map<String, ServiceInfo> getServices(String stackName, String version) throws AmbariException { - Map<String, ServiceInfo> servicesInfoResult = new HashMap<String, ServiceInfo>(); + Map<String, ServiceInfo> servicesInfoResult = new HashMap<>(); Collection<ServiceInfo> services; StackInfo stack; @@ -558,7 +558,7 @@ public class AmbariMetaInfo { public Collection<String> getMonitoringServiceNames(String stackName, String version) throws AmbariException{ - List<String> monitoringServices = new ArrayList<String>(); + List<String> monitoringServices = new ArrayList<>(); for (ServiceInfo service : getServices(stackName, version).values()) { if ((service.isMonitoringService() != null) && service.isMonitoringService()) { monitoringServices.add(service.getName()); @@ -570,7 +570,7 @@ public class AmbariMetaInfo { public Set<String> getRestartRequiredServicesNames(String stackName, String version) throws AmbariException{ - HashSet<String> needRestartServices = new HashSet<String>(); + HashSet<String> needRestartServices = new HashSet<>(); Collection<ServiceInfo> serviceInfos = getServices(stackName, version).values(); for (ServiceInfo service : serviceInfos) { @@ -597,7 +597,7 @@ public class AmbariMetaInfo { public Set<String> getRackSensitiveServicesNames(String stackName, String version) throws AmbariException { - HashSet<String> needRestartServices = new HashSet<String>(); + HashSet<String> needRestartServices = new HashSet<>(); Collection<ServiceInfo> serviceInfos = getServices(stackName, version).values(); @@ -637,7 +637,7 @@ public class AmbariMetaInfo { } public List<String> getStackParentVersions(String stackName, String version) { - List<String> parents = new ArrayList<String>(); + List<String> parents = new ArrayList<>(); try { StackInfo stackInfo = getStack(stackName, version); String parentVersion = stackInfo.getParentStackVersion(); @@ -678,13 +678,13 @@ public class AmbariMetaInfo { public Set<PropertyInfo> getServiceProperties(String stackName, String version, String serviceName) throws AmbariException { - return new HashSet<PropertyInfo>(getService(stackName, version, serviceName).getProperties()); + return new HashSet<>(getService(stackName, version, serviceName).getProperties()); } public Set<PropertyInfo> getStackProperties(String stackName, String version) throws AmbariException { - return new HashSet<PropertyInfo>(getStack(stackName, version).getProperties()); + return new HashSet<>(getStack(stackName, version).getProperties()); } public Set<PropertyInfo> getPropertiesByName(String stackName, String version, String serviceName, String propertyName) @@ -701,7 +701,7 @@ public class AmbariMetaInfo { + ", propertyName=" + propertyName); } - Set<PropertyInfo> propertyResult = new HashSet<PropertyInfo>(); + Set<PropertyInfo> propertyResult = new HashSet<>(); for (PropertyInfo property : properties) { if (property.getName().equals(propertyName)) { @@ -729,7 +729,7 @@ public class AmbariMetaInfo { + ", propertyName=" + propertyName); } - Set<PropertyInfo> propertyResult = new HashSet<PropertyInfo>(); + Set<PropertyInfo> propertyResult = new HashSet<>(); for (PropertyInfo property : properties) { if (property.getName().equals(propertyName)) { @@ -752,7 +752,7 @@ public class AmbariMetaInfo { public Set<OperatingSystemInfo> getOperatingSystems(String stackName, String version) throws AmbariException { - Set<OperatingSystemInfo> operatingSystems = new HashSet<OperatingSystemInfo>(); + Set<OperatingSystemInfo> operatingSystems = new HashSet<>(); StackInfo stack = getStack(stackName, version); List<RepositoryInfo> repositories = stack.getRepositories(); for (RepositoryInfo repository : repositories) { @@ -1027,7 +1027,7 @@ public class AmbariMetaInfo { } private Map<String, Metric> getAggregateFunctionMetrics(String metricName, Metric currentMetric) { - Map<String, Metric> newMetrics = new HashMap<String, Metric>(); + Map<String, Metric> newMetrics = new HashMap<>(); if (!PropertyHelper.hasAggregateFunctionSuffix(currentMetric.getName())) { // For every function id for (String identifierToAdd : AGGREGATE_FUNCTION_IDENTIFIERS) { @@ -1139,8 +1139,8 @@ public class AmbariMetaInfo { // creating a mapping between names and service/component for fast lookups Collection<ServiceInfo> stackServices = stackInfo.getServices(); - Map<String, ServiceInfo> stackServiceMap = new HashMap<String, ServiceInfo>(); - Map<String, ComponentInfo> stackComponentMap = new HashMap<String, ComponentInfo>(); + Map<String, ServiceInfo> stackServiceMap = new HashMap<>(); + Map<String, ComponentInfo> stackComponentMap = new HashMap<>(); for (ServiceInfo stackService : stackServices) { stackServiceMap.put(stackService.getName(), stackService); @@ -1155,7 +1155,7 @@ public class AmbariMetaInfo { // for every service installed in that cluster, get the service metainfo // and off of that the alert definitions - List<AlertDefinition> stackDefinitions = new ArrayList<AlertDefinition>(50); + List<AlertDefinition> stackDefinitions = new ArrayList<>(50); for (String clusterServiceName : clusterServiceNames) { ServiceInfo stackService = stackServiceMap.get(clusterServiceName); if (null == stackService) { @@ -1168,11 +1168,11 @@ public class AmbariMetaInfo { stackDefinitions.addAll(serviceDefinitions); } - List<AlertDefinitionEntity> persist = new ArrayList<AlertDefinitionEntity>(); + List<AlertDefinitionEntity> persist = new ArrayList<>(); List<AlertDefinitionEntity> entities = alertDefinitionDao.findAll(clusterId); // create a map of the entities for fast extraction - Map<String, AlertDefinitionEntity> mappedEntities = new HashMap<String, AlertDefinitionEntity>(100); + Map<String, AlertDefinitionEntity> mappedEntities = new HashMap<>(100); for (AlertDefinitionEntity entity : entities) { mappedEntities.put(entity.getDefinitionName(), entity); } @@ -1253,7 +1253,7 @@ public class AmbariMetaInfo { // stack but still exists in the database - we disable the alert to // preserve historical references List<AlertDefinitionEntity> definitions = alertDefinitionDao.findAllEnabled(clusterId); - List<AlertDefinitionEntity> definitionsToDisable = new ArrayList<AlertDefinitionEntity>(); + List<AlertDefinitionEntity> definitionsToDisable = new ArrayList<>(); for (AlertDefinitionEntity definition : definitions) { String serviceName = definition.getServiceName(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java index 73af2c8..d4f530f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java @@ -186,7 +186,7 @@ public abstract class BaseRequest implements Request { if (partialResponseFields == null) { mapProperties = Collections.emptyMap(); } else { - Set<String> setMatches = new HashSet<String>(); + Set<String> setMatches = new HashSet<>(); // Pattern basically splits a string using ',' as the deliminator unless ',' is between '[' and ']'. // Actually, captures char sequences between ',' and all chars between '[' and ']' including ','. Pattern re = Pattern.compile("[^,\\[]*?\\[[^\\]]*?\\]|[^,]+"); @@ -197,7 +197,7 @@ public abstract class BaseRequest implements Request { } } - mapProperties = new HashMap<String, TemporalInfo>(setMatches.size()); + mapProperties = new HashMap<>(setMatches.size()); for (String field : setMatches) { TemporalInfo temporalInfo = null; if (field.contains("[")) { @@ -366,7 +366,7 @@ public abstract class BaseRequest implements Request { String sortByParams = m_uriInfo.getQueryParameters().getFirst(QueryLexer.QUERY_SORT); if (sortByParams != null && !sortByParams.isEmpty()) { String[] params = sortByParams.split(","); - List<SortRequestProperty> properties = new ArrayList<SortRequestProperty>(); + List<SortRequestProperty> properties = new ArrayList<>(); if (params.length > 0) { for (String property : params) { SortRequest.Order order = SortRequest.Order.ASC; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java index 23d8aad..0aeb52b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java @@ -97,7 +97,7 @@ public class ClusterKerberosDescriptorService extends BaseService { * @return a service resource instance */ ResourceInstance createResource(String type) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ClusterKerberosDescriptor, type); return createResource(Resource.Type.ClusterKerberosDescriptor, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java index 8c91878..2efd392 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterPrivilegeService.java @@ -50,7 +50,7 @@ public class ClusterPrivilegeService extends PrivilegeService { @Override protected ResourceInstance createPrivilegeResource(String privilegeId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ClusterPrivilege, privilegeId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java index 9f6feaa..5577633 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java @@ -688,7 +688,7 @@ public class ClusterService extends BaseService { * @return an artifact resource instance */ ResourceInstance createArtifactResource(String clusterName, String artifactName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Artifact, artifactName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java index e3150b0..0821f7c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java @@ -99,7 +99,7 @@ public class ClusterStackVersionService extends BaseService { @Path("{stackVersionId}/repository_versions") public RepositoryVersionService getRepositoryVersionService(@Context javax.ws.rs.core.Request request, @PathParam("stackVersionId") String stackVersion) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ClusterStackVersion, stackVersion); return new RepositoryVersionService(mapIds); @@ -145,7 +145,7 @@ public class ClusterStackVersionService extends BaseService { * @return a cluster stack version resource instance */ private ResourceInstance createResource(String stackVersionId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ClusterStackVersion, stackVersionId); return createResource(Resource.Type.ClusterStackVersion, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java index 12d6433..c6748bc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java @@ -90,7 +90,7 @@ public class CompatibleRepositoryVersionService extends BaseService { */ @Path("{repositoryVersionId}/operating_systems") public OperatingSystemService getOperatingSystemsHandler(@PathParam("repositoryVersionId") String repositoryVersionId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.CompatibleRepositoryVersion, repositoryVersionId); @@ -105,7 +105,7 @@ public class CompatibleRepositoryVersionService extends BaseService { * @return a repository resource instance */ private ResourceInstance createResource(String repositoryVersionId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.CompatibleRepositoryVersion, repositoryVersionId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java index 1725b11..f29b396 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java @@ -220,7 +220,7 @@ public class ComponentService extends BaseService { * @return a component resource instance */ ResourceInstance createComponentResource(String clusterName, String serviceName, String componentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Service, serviceName); mapIds.put(Resource.Type.Component, componentName); @@ -230,7 +230,7 @@ public class ComponentService extends BaseService { private Response createClientConfigResource(String body, HttpHeaders headers, UriInfo ui, String componentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.Service, m_serviceName); mapIds.put(Resource.Type.Component, componentName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java index 8f3ec45..ae5ea53 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java @@ -149,7 +149,7 @@ public class ConfigGroupService extends BaseService { */ ResourceInstance createConfigGroupResource(String clusterName, String groupId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ConfigGroup, groupId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java index 946c444..bebcb03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java @@ -107,7 +107,7 @@ public class ConfigurationService extends BaseService { * @return a service resource instance */ ResourceInstance createConfigurationResource(String clusterName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Configuration, null); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java index 27786ae..449c292 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java @@ -136,7 +136,7 @@ public class CredentialService extends BaseService { * @return a credential resource instance */ ResourceInstance createCredentialResource(String alias) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, this.clusterName); mapIds.put(Resource.Type.Credential, alias); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java index 4bacfbf..457313d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java @@ -93,7 +93,7 @@ public class ExtensionLinksService extends BaseService { } ResourceInstance createExtensionLinkResource(String linkId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.ExtensionLink, linkId); return createResource(Resource.Type.ExtensionLink, mapIds); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java index 176c259..5ba7341 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java @@ -100,7 +100,7 @@ public class ExtensionsService extends BaseService { ResourceInstance createExtensionVersionResource(String extensionName, String extensionVersion) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Extension, extensionName); mapIds.put(Resource.Type.ExtensionVersion, extensionVersion); @@ -109,7 +109,7 @@ public class ExtensionsService extends BaseService { ResourceInstance createExtensionLinkResource(String stackName, String stackVersion, String extensionName, String extensionVersion) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.Extension, extensionName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java index 9c1f1a3..0c7c2e9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/GroupPrivilegeService.java @@ -69,7 +69,7 @@ public class GroupPrivilegeService extends PrivilegeService { @Override protected ResourceInstance createPrivilegeResource(String privilegeId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Group, groupName); mapIds.put(Resource.Type.GroupPrivilege, privilegeId); return createResource(Resource.Type.GroupPrivilege, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java index cdd1761..e4f2be9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java @@ -238,7 +238,7 @@ public class HostComponentService extends BaseService { @Produces("text/plain") public Response getProcesses(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("hostComponentName") String hostComponentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.Host, m_hostName); mapIds.put(Resource.Type.HostComponent, hostComponentName); @@ -258,7 +258,7 @@ public class HostComponentService extends BaseService { * @return a host resource instance */ ResourceInstance createHostComponentResource(String clusterName, String hostName, String hostComponentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Host, hostName); mapIds.put(Resource.Type.HostComponent, hostComponentName); @@ -268,7 +268,7 @@ public class HostComponentService extends BaseService { private Response createClientConfigResource(String body, HttpHeaders headers, UriInfo ui, String hostComponentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.Host, m_hostName); mapIds.put(Resource.Type.Component, hostComponentName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java index 418b4d5..a99d269 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java @@ -111,7 +111,7 @@ public class HostKerberosIdentityService extends BaseService { * @return a component resource instance */ ResourceInstance createResource(String clusterName, String hostName, String identityId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Host, hostName); mapIds.put(Resource.Type.HostKerberosIdentity, identityId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java index 0ce29ae..c26c5d8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java @@ -283,7 +283,7 @@ public class HostService extends BaseService { * @return a host resource instance */ ResourceInstance createHostResource(String clusterName, String hostName, UriInfo ui) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Host, hostName); if (clusterName != null) { mapIds.put(Resource.Type.Cluster, clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java index f449052..1c91eee 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java @@ -113,7 +113,7 @@ public class HostStackVersionService extends BaseService { */ @Path("{stackVersionId}/repository_versions") public RepositoryVersionService getRepositoryVersionHandler(@PathParam("stackVersionId") String stackVersionId) { - final Map<Resource.Type, String> stackVersionProperties = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> stackVersionProperties = new HashMap<>(); stackVersionProperties.put(Resource.Type.Host, hostName); stackVersionProperties.put(Resource.Type.HostStackVersion, stackVersionId); return new RepositoryVersionService(stackVersionProperties); @@ -128,7 +128,7 @@ public class HostStackVersionService extends BaseService { * @return a host host version resource instance */ private ResourceInstance createResource(UriInfo ui, String clusterName, String hostName, String stackVersionId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); if (clusterName != null) { mapIds.put(Resource.Type.Cluster, clusterName); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java index 5c48824..f216e67 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java @@ -173,7 +173,7 @@ public class InstanceService extends BaseService { ResourceInstance createInstanceResource(String feedName, String instanceID, UriInfo ui) { boolean isAttached = ui.getRequestUri().toString().contains("/feeds/"); - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.DRInstance, instanceID); if (isAttached) { mapIds.put(Resource.Type.DRFeed, feedName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java index ab4b635..2ea83e2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java @@ -112,7 +112,7 @@ public class JobService extends BaseService { */ ResourceInstance createJobResource(String clusterName, String workflowId, String jobId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type,String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Workflow, workflowId); mapIds.put(Resource.Type.Job, jobId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java index d83aa25..83853d2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java @@ -147,7 +147,7 @@ public class LoggingService extends BaseService { uriInfo.getQueryParameters(); Map<String, String> enumeratedQueryParameters = - new HashMap<String, String>(); + new HashMap<>(); for (String queryName : queryParameters.keySet()) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java index 28e53e6..836aa9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MemberService.java @@ -155,7 +155,7 @@ public class MemberService extends BaseService { * @return a member resource instance */ private ResourceInstance createMemberResource(String groupName, String userName) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Group, groupName); mapIds.put(Resource.Type.Member, userName); return createResource(Resource.Type.Member, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java index 531f964..3117054 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java @@ -105,7 +105,7 @@ public class OperatingSystemService extends BaseService { */ @Path("{osType}/repositories") public RepositoryService getOperatingSystemsHandler(@PathParam("osType") String osType) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.OperatingSystem, osType); return new RepositoryService(mapIds); @@ -119,7 +119,7 @@ public class OperatingSystemService extends BaseService { * @return an operating system instance */ private ResourceInstance createResource(String osType) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.OperatingSystem, osType); return createResource(Resource.Type.OperatingSystem, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java index 52a20df..8e9ba2b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueImpl.java @@ -45,7 +45,7 @@ public class PersistKeyValueImpl { } public Collection<String> generateKeys(int number) { - List<String> keys = new ArrayList<String>(number); + List<String> keys = new ArrayList<>(number); for (int i = 0; i < number; i++) { keys.add(generateKey()); } @@ -80,7 +80,7 @@ public class PersistKeyValueImpl { } public synchronized Map<String, String> getAllKeyValues() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for (KeyValueEntity keyValueEntity : keyValueDAO.findAll()) { map.put(keyValueEntity.getKey(), keyValueEntity.getValue()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java index 83217c5..e303622 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java @@ -72,7 +72,7 @@ public class PersistKeyValueService { public String store(String values) throws IOException, JAXBException { LOG.debug("Received message from UI " + values); Collection<String> valueCollection = StageUtils.fromJson(values, Collection.class); - Collection<String> keys = new ArrayList<String>(valueCollection.size()); + Collection<String> keys = new ArrayList<>(valueCollection.size()); for (String s : valueCollection) { keys.add(persistKeyVal.put(s)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java index 23248b30..8c8fb7f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java @@ -61,7 +61,7 @@ public class RecommendationService extends BaseService { } ResourceInstance createRecommendationResource(String stackName, String stackVersion) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java index e366ad5..c88ca14 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java @@ -153,7 +153,7 @@ public class RepositoryService extends BaseService { * @return a repository instance */ private ResourceInstance createResource(String repoId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.Repository, repoId); return createResource(Resource.Type.Repository, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java index 0a21762..a3e707d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java @@ -138,7 +138,7 @@ public class RepositoryVersionService extends BaseService { */ @Path("{repositoryVersionId}/operating_systems") public OperatingSystemService getOperatingSystemsHandler(@PathParam("repositoryVersionId") String repositoryVersionId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.RepositoryVersion, repositoryVersionId); return new OperatingSystemService(mapIds); @@ -152,7 +152,7 @@ public class RepositoryVersionService extends BaseService { * @return a repository resource instance */ private ResourceInstance createResource(String repositoryVersionId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.putAll(parentKeyProperties); mapIds.put(Resource.Type.RepositoryVersion, repositoryVersionId); return createResource(Resource.Type.RepositoryVersion, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestBody.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestBody.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestBody.java index 548922d..1024905 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestBody.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestBody.java @@ -41,7 +41,7 @@ public class RequestBody { /** * The body properties. */ - private Set<NamedPropertySet> m_propertySets = new HashSet<NamedPropertySet>(); + private Set<NamedPropertySet> m_propertySets = new HashSet<>(); /** * The request body. Query and partial response data is stripped before setting. @@ -51,7 +51,7 @@ public class RequestBody { /** * Request properties. */ - private Map<String, String> m_requestInfoProps = new HashMap<String, String>(); + private Map<String, String> m_requestInfoProps = new HashMap<>(); /** @@ -119,7 +119,7 @@ public class RequestBody { */ public Set<Map<String, Object>> getPropertySets() { Set<NamedPropertySet> setNamedProps = getNamedPropertySets(); - Set<Map<String, Object>> setProps = new HashSet<Map<String, Object>>(setNamedProps.size()); + Set<Map<String, Object>> setProps = new HashSet<>(setNamedProps.size()); for (NamedPropertySet namedProps : setNamedProps) { setProps.add(namedProps.getProperties()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java index 05b9d9c..fd3a482 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestFactory.java @@ -116,7 +116,7 @@ public class RequestFactory { * @return map of query parameters or an empty map if no parameters are present */ private Map<String, String> getQueryParameters(UriInfo uriInfo, RequestBody body) { - Map<String, String> queryParameters = new HashMap<String, String>(); + Map<String, String> queryParameters = new HashMap<>(); for (Map.Entry<String, List<String>> entry : uriInfo.getQueryParameters().entrySet()) { queryParameters.put(entry.getKey(), entry.getValue().get(0)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java index 90bc3ee..cfcc2d7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java @@ -133,7 +133,7 @@ public class RequestScheduleService extends BaseService { */ private ResourceInstance createRequestSchedule(String clusterName, String requestScheduleId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.RequestSchedule, requestScheduleId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java index f6d62d8..936b857 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java @@ -155,7 +155,7 @@ public class RequestService extends BaseService { * @return a request resource instance */ ResourceInstance createRequestResource(String clusterName, String requestId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); if (null != clusterName) mapIds.put(Resource.Type.Cluster, clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java index 4b46387..fa1a61e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultImpl.java @@ -47,7 +47,7 @@ public class ResultImpl implements Result { /** * Tree structure which holds the results */ - private TreeNode<Resource> m_tree = new TreeNodeImpl<Resource>(null, null, null); + private TreeNode<Resource> m_tree = new TreeNodeImpl<>(null, null, null); /** http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java index a1a0392..5bd5357 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ResultPostProcessorImpl.java @@ -45,7 +45,7 @@ public class ResultPostProcessorImpl implements ResultPostProcessor { * These are used to act on specific resource types contained in the result. */ Map<Resource.Type, List<ResourceDefinition.PostProcessor>> - m_mapPostProcessors = new HashMap<Resource.Type, List<ResourceDefinition.PostProcessor>>(); + m_mapPostProcessors = new HashMap<>(); /** @@ -132,7 +132,7 @@ public class ResultPostProcessorImpl implements ResultPostProcessor { Resource.Type type = resource.getResourceDefinition().getType(); List<ResourceDefinition.PostProcessor> listProcessors = m_mapPostProcessors.get(type); if (listProcessors == null) { - listProcessors = new ArrayList<ResourceDefinition.PostProcessor>(); + listProcessors = new ArrayList<>(); m_mapPostProcessors.put(type, listProcessors); } listProcessors.addAll(resource.getResourceDefinition().getPostProcessors()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java index 8bc2041..f7365a1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java @@ -99,7 +99,7 @@ public class RoleAuthorizationService extends BaseService { * @return an authorization resource instance */ protected ResourceInstance createAuthorizationResource(String authorizationId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Permission, permissionId); mapIds.put(Resource.Type.RoleAuthorization, authorizationId); return createResource(Resource.Type.RoleAuthorization, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java index 79b266f..ce9240c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java @@ -88,7 +88,7 @@ public class RootServiceService extends BaseService { protected ResourceInstance createHostResource(String hostName) { - return createResource(Resource.Type.Host, Collections.<Resource.Type, String>singletonMap(Resource.Type.Host, hostName)); + return createResource(Resource.Type.Host, Collections.singletonMap(Resource.Type.Host, hostName)); } @@ -118,7 +118,7 @@ public class RootServiceService extends BaseService { protected ResourceInstance createHostComponentResource(String serviceName, String hostName, String componentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.RootService, serviceName); mapIds.put(Resource.Type.Host, hostName); mapIds.put(Resource.Type.RootServiceComponent, componentName); @@ -155,7 +155,7 @@ public class RootServiceService extends BaseService { protected ResourceInstance createServiceComponentResource(String serviceName, String componentName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.RootService, serviceName); mapIds.put(Resource.Type.RootServiceComponent, componentName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java index 569a3d7..43eabdc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java @@ -49,7 +49,7 @@ public class ServiceConfigVersionService extends BaseService { ResourceInstance createServiceConfigResource(String clusterName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.ServiceConfigVersion, null); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java index ad6d68c..52871f2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java @@ -391,7 +391,7 @@ public class ServiceService extends BaseService { * @return a service resource instance */ ResourceInstance createServiceResource(String clusterName, String serviceName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Service, serviceName); @@ -408,7 +408,7 @@ public class ServiceService extends BaseService { * @return an artifact resource instance */ ResourceInstance createArtifactResource(String clusterName, String serviceName, String artifactName) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Service, serviceName); mapIds.put(Resource.Type.Artifact, artifactName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java index 2c85e01..86bacf1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java @@ -342,7 +342,7 @@ public class StacksService extends BaseService { */ @Path("{stackName}/versions/{stackVersion}/operating_systems") public OperatingSystemService getOperatingSystemsHandler(@PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) { - final Map<Resource.Type, String> stackProperties = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> stackProperties = new HashMap<>(); stackProperties.put(Resource.Type.Stack, stackName); stackProperties.put(Resource.Type.StackVersion, stackVersion); return new OperatingSystemService(stackProperties); @@ -357,7 +357,7 @@ public class StacksService extends BaseService { */ @Path("{stackName}/versions/{stackVersion}/repository_versions") public RepositoryVersionService getRepositoryVersionHandler(@PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) { - final Map<Resource.Type, String> stackProperties = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> stackProperties = new HashMap<>(); stackProperties.put(Resource.Type.Stack, stackName); stackProperties.put(Resource.Type.StackVersion, stackVersion); return new RepositoryVersionService(stackProperties); @@ -374,7 +374,7 @@ public class StacksService extends BaseService { public CompatibleRepositoryVersionService getCompatibleRepositoryVersionHandler( @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) { - final Map<Resource.Type, String> stackProperties = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> stackProperties = new HashMap<>(); stackProperties.put(Resource.Type.Stack, stackName); stackProperties.put(Resource.Type.StackVersion, stackVersion); return new CompatibleRepositoryVersionService(stackProperties); @@ -383,7 +383,7 @@ public class StacksService extends BaseService { ResourceInstance createStackServiceComponentResource( String stackName, String stackVersion, String serviceName, String componentName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -395,7 +395,7 @@ public class StacksService extends BaseService { ResourceInstance createStackServiceComponentDependencyResource( String stackName, String stackVersion, String serviceName, String componentName, String dependencyName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -408,7 +408,7 @@ public class StacksService extends BaseService { ResourceInstance createStackConfigurationResource(String stackName, String stackVersion, String serviceName, String propertyName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -420,7 +420,7 @@ public class StacksService extends BaseService { ResourceInstance createStackConfigurationDependencyResource(String stackName, String stackVersion, String serviceName, String propertyName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -431,7 +431,7 @@ public class StacksService extends BaseService { ResourceInstance createStackServiceResource(String stackName, String stackVersion, String serviceName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -441,7 +441,7 @@ public class StacksService extends BaseService { ResourceInstance createStackVersionResource(String stackName, String stackVersion) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); @@ -450,7 +450,7 @@ public class StacksService extends BaseService { ResourceInstance createStackLevelConfigurationsResource(String stackName, String stackVersion, String propertyName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackLevelConfiguration, propertyName); @@ -459,7 +459,7 @@ public class StacksService extends BaseService { } ResourceInstance createStackArtifactsResource(String stackName, String stackVersion, String artifactName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackArtifact, artifactName); @@ -472,7 +472,7 @@ public class StacksService extends BaseService { String serviceName, String artifactName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -483,7 +483,7 @@ public class StacksService extends BaseService { ResourceInstance createStackServiceThemesResource(String stackName, String stackVersion, String serviceName, String themeName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -494,7 +494,7 @@ public class StacksService extends BaseService { ResourceInstance createStackServiceQuickLinksResource(String stackName, String stackVersion, String serviceName, String quickLinksConfigurationName) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.StackService, serviceName); @@ -505,7 +505,7 @@ public class StacksService extends BaseService { ResourceInstance createExtensionLinkResource(String stackName, String stackVersion, String extensionName, String extensionVersion) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Stack, stackName); mapIds.put(Resource.Type.StackVersion, stackVersion); mapIds.put(Resource.Type.Extension, extensionName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java index 76f605d..6dc9010 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java @@ -156,7 +156,7 @@ public class StageService extends BaseService { * @return a stage resource instance */ ResourceInstance createStageResource(String clusterName, String requestId, String stageId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); if (clusterName != null) { mapIds.put(Resource.Type.Cluster, clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java index 532a5a4..af7f378 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java @@ -119,7 +119,7 @@ public class TaskAttemptService extends BaseService { */ ResourceInstance createTaskAttemptResource(String clusterName, String workflowId, String jobId, String taskAttemptId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type,String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Workflow, workflowId); mapIds.put(Resource.Type.Job, jobId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java index 8f0bcdd..acc4eef 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java @@ -111,7 +111,7 @@ public class TaskService extends BaseService { * @return a task resource instance */ ResourceInstance createTaskResource(String clusterName, String requestId, String stageId, String taskId) { - Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); mapIds.put(Resource.Type.Request, requestId); mapIds.put(Resource.Type.Stage, stageId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java index a9aa500..a3866be 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java @@ -76,7 +76,7 @@ public class UpgradeGroupService extends BaseService { * @return the resource instance */ private ResourceInstance createResourceInstance(Long groupId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.Upgrade, m_upgradeId); mapIds.put(Resource.Type.Request, m_upgradeId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java index ab7e125..6d6c5e3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java @@ -102,7 +102,7 @@ public class UpgradeItemService extends BaseService { * @return the resource instance */ ResourceInstance createResourceInstance(Long upgradeItemId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); mapIds.put(Resource.Type.Upgrade, m_upgradeId); mapIds.put(Resource.Type.UpgradeGroup, m_upgradeGroupId); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java index e122e7c..dc54a0b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java @@ -100,7 +100,7 @@ public class UpgradeService extends BaseService { * @return the resource instance */ private ResourceInstance createResourceInstance(Long upgradeId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); if (null != upgradeId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java index d91ac1b..36d0074 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java @@ -72,7 +72,7 @@ public class UpgradeSummaryService extends BaseService { * @return the resource instance */ private ResourceInstance createResourceInstance(Long requestId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, m_clusterName); if (null != requestId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java index 26a7107..26d9c1d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserAuthorizationService.java @@ -95,7 +95,7 @@ public class UserAuthorizationService extends BaseService { * @return an authorization resource instance */ protected ResourceInstance createAuthorizationResource(String authorizationId) { - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.User, StringUtils.lowerCase(username)); mapIds.put(Resource.Type.UserAuthorization, authorizationId); return createResource(Resource.Type.UserAuthorization, mapIds); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java index f9c95e7..7df806d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UserPrivilegeService.java @@ -71,7 +71,7 @@ public class UserPrivilegeService extends PrivilegeService { @Override protected ResourceInstance createPrivilegeResource(String privilegeId) { - final Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + final Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.User, StringUtils.lowerCase(userName)); mapIds.put(Resource.Type.UserPrivilege, privilegeId); return createResource(Resource.Type.UserPrivilege, mapIds);
