http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java index 0c9a38b..6c4bc1f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java @@ -58,7 +58,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider { /** * The key property ids for a permission resource. */ - private static Map<Resource.Type, String> keyPropertyIds = new HashMap<Resource.Type, String>(); + private static Map<Resource.Type, String> keyPropertyIds = new HashMap<>(); static { keyPropertyIds.put(Resource.Type.Permission, PERMISSION_ID_PROPERTY_ID); } @@ -66,7 +66,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider { /** * The property ids for a permission resource. */ - private static Set<String> propertyIds = new HashSet<String>(); + private static Set<String> propertyIds = new HashSet<>(); static { propertyIds.add(PERMISSION_ID_PROPERTY_ID); propertyIds.add(PERMISSION_NAME_PROPERTY_ID); @@ -111,7 +111,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider { public Set<Resource> getResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); Set<String> requestedIds = getRequestPropertyIds(request, predicate); for(PermissionEntity permissionEntity : permissionDAO.findAll()){ @@ -144,7 +144,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider { @Override protected Set<String> getPKPropertyIds() { - return new HashSet<String>(keyPropertyIds.values()); + return new HashSet<>(keyPropertyIds.values()); }
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java index d2643b8..010ffea 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java @@ -133,7 +133,7 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider { public Set<Resource> getResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<Resource> resources = new HashSet<Resource>(); + final Set<Resource> resources = new HashSet<>(); final Set<String> requestedIds = getRequestPropertyIds(request, predicate); final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java index 07b98bd..e8bef9e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java @@ -175,9 +175,9 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes @Override public Set<Resource> getResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); Set<String> requestedIds = getRequestPropertyIds(request, predicate); - Set<Long> resourceIds = new HashSet<Long>(); + Set<Long> resourceIds = new HashSet<>(); Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate); @@ -195,10 +195,10 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes resourceIds.addAll(resourceEntities.keySet()); - Set<PrivilegeEntity> entitySet = new HashSet<PrivilegeEntity>(); - List<PrincipalEntity> userPrincipals = new LinkedList<PrincipalEntity>(); - List<PrincipalEntity> groupPrincipals = new LinkedList<PrincipalEntity>(); - List<PrincipalEntity> rolePrincipals = new LinkedList<PrincipalEntity>(); + Set<PrivilegeEntity> entitySet = new HashSet<>(); + List<PrincipalEntity> userPrincipals = new LinkedList<>(); + List<PrincipalEntity> groupPrincipals = new LinkedList<>(); + List<PrincipalEntity> rolePrincipals = new LinkedList<>(); List<PrivilegeEntity> entities = privilegeDAO.findAll(); @@ -221,7 +221,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes } } - Map<Long, UserEntity> userEntities = new HashMap<Long, UserEntity>(); + Map<Long, UserEntity> userEntities = new HashMap<>(); if(!userPrincipals.isEmpty()) { List<UserEntity> userList = userDAO.findUsersByPrincipal(userPrincipals); for (UserEntity userEntity : userList) { @@ -229,7 +229,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes } } - Map<Long, GroupEntity> groupEntities = new HashMap<Long, GroupEntity>(); + Map<Long, GroupEntity> groupEntities = new HashMap<>(); if(!groupPrincipals.isEmpty()) { List<GroupEntity> groupList = groupDAO.findGroupsByPrincipal(groupPrincipals); for (GroupEntity groupEntity : groupList) { @@ -237,7 +237,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes } } - Map<Long, PermissionEntity> roleEntities = new HashMap<Long, PermissionEntity>(); + Map<Long, PermissionEntity> roleEntities = new HashMap<>(); if (!rolePrincipals.isEmpty()){ List<PermissionEntity> roleList = permissionDAO.findPermissionsByPrincipal(rolePrincipals); for (PermissionEntity roleEntity : roleList) { @@ -277,7 +277,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes @Override protected Set<String> getPKPropertyIds() { - return new HashSet<String>(getKeyPropertyIds().values()); + return new HashSet<>(getKeyPropertyIds().values()); } @@ -478,7 +478,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes @Override public Void invoke() throws AmbariException { Long resource = null; - final List<PrivilegeEntity> requiredEntities = new ArrayList<PrivilegeEntity>(); + final List<PrivilegeEntity> requiredEntities = new ArrayList<>(); for (Map<String, Object> properties: request.getProperties()) { Set<Long> resourceIds = getResourceEntities(properties).keySet(); Long resourceId = resourceIds.iterator().next(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java index c6cc017..a132af9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PropertyPredicateVisitor.java @@ -35,7 +35,7 @@ import org.apache.ambari.server.controller.utilities.PredicateHelper; * Predicate visitor for extracting property values from the {@link PropertyPredicate}s of a predicate graph. */ public class PropertyPredicateVisitor implements PredicateVisitor { - private final Map<String, Object> properties = new HashMap<String, Object>(); + private final Map<String, Object> properties = new HashMap<>(); @Override public void acceptComparisonPredicate(ComparisonPredicate predicate) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java index 714ae53..073ec60 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java @@ -57,17 +57,17 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc /** * primary key fields */ - public static Set<String> pkPropertyIds = new HashSet<String>(); + public static Set<String> pkPropertyIds = new HashSet<>(); /** * map of resource type to fk field */ public static Map<Resource.Type, String> keyPropertyIds = - new HashMap<Resource.Type, String>(); + new HashMap<>(); /** * resource properties */ - public static Set<String> propertyIds = new HashSet<String>(); + public static Set<String> propertyIds = new HashSet<>(); static { keyPropertyIds.put(Resource.Type.QuickLink, QUICKLINK_FILE_NAME_PROPERTY_ID); @@ -105,7 +105,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc public Set<Resource> getResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> resources = new LinkedHashSet<Resource>(); + Set<Resource> resources = new LinkedHashSet<>(); resources.addAll(getQuickLinks(request, predicate)); // add other artifacts types here @@ -133,7 +133,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc private Set<Resource> getQuickLinks(Request request, Predicate predicate) throws NoSuchParentResourceException, NoSuchResourceException, UnsupportedPropertyException, SystemException { - Set<Resource> resources = new LinkedHashSet<Resource>(); + Set<Resource> resources = new LinkedHashSet<>(); for (Map<String, Object> properties : getPropertyMaps(predicate)) { String quickLinksFileName = (String) properties.get(QUICKLINK_FILE_NAME_PROPERTY_ID); String stackName = (String) properties.get(STACK_NAME_PROPERTY_ID); @@ -148,7 +148,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc "Parent stack resource doesn't exist: stackName='%s', stackVersion='%s'", stackName, stackVersion)); } - List<ServiceInfo> serviceInfoList = new ArrayList<ServiceInfo>(); + List<ServiceInfo> serviceInfoList = new ArrayList<>(); if (stackService == null) { serviceInfoList.addAll(stackInfo.getServices()); @@ -163,7 +163,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc } for (ServiceInfo serviceInfo : serviceInfoList) { - List<QuickLinksConfigurationInfo> serviceQuickLinks = new ArrayList<QuickLinksConfigurationInfo>(); + List<QuickLinksConfigurationInfo> serviceQuickLinks = new ArrayList<>(); if (quickLinksFileName != null) { LOG.debug("Getting quick links from service {}, quick links = {}", serviceInfo.getName(), serviceInfo.getQuickLinksConfigurationsMap()); serviceQuickLinks.add(serviceInfo.getQuickLinksConfigurationsMap().get(quickLinksFileName)); @@ -179,7 +179,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc setVisibility(serviceInfo.getName(), serviceQuickLinks); - List<Resource> serviceResources = new ArrayList<Resource>(); + List<Resource> serviceResources = new ArrayList<>(); for (QuickLinksConfigurationInfo quickLinksConfigurationInfo : serviceQuickLinks) { Resource resource = new ResourceImpl(Resource.Type.QuickLink); Set<String> requestedIds = getRequestPropertyIds(request, predicate); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java index 2018f26..209ee74 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java @@ -69,8 +69,8 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider protected static final String BINDING_HOST_GROUPS_NAME_PROPERTY_ID = "name"; protected static final String BINDING_HOST_GROUPS_HOSTS_PROPERTY_ID = "hosts"; - private static Set<String> pkPropertyIds = new HashSet<String>( - Arrays.asList(new String[] { RECOMMENDATION_ID_PROPERTY_ID })); + private static Set<String> pkPropertyIds = new HashSet<>( + Arrays.asList(new String[]{RECOMMENDATION_ID_PROPERTY_ID})); protected RecommendationResourceProvider(Set<String> propertyIds, Map<Type, String> keyPropertyIds, AmbariManagementController managementController) { @@ -117,9 +117,9 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider .getRecommendations().getBlueprint().getConfigurations(), getPropertyIds()); Set<HostGroup> hostGroups = response.getRecommendations().getBlueprint().getHostGroups(); - List<Map<String, Object>> listGroupProps = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> listGroupProps = new ArrayList<>(); for (HostGroup hostGroup : hostGroups) { - Map<String, Object> mapGroupProps = new HashMap<String, Object>(); + Map<String, Object> mapGroupProps = new HashMap<>(); mapGroupProps.put(BLUEPRINT_HOST_GROUPS_NAME_PROPERTY_ID, hostGroup.getName()); mapGroupProps .put(BLUEPRINT_HOST_GROUPS_COMPONENTS_PROPERTY_ID, hostGroup.getComponents()); @@ -130,9 +130,9 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider Set<BindingHostGroup> bindingHostGroups = response.getRecommendations() .getBlueprintClusterBinding().getHostGroups(); - List<Map<String, Object>> listBindingGroupProps = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> listBindingGroupProps = new ArrayList<>(); for (BindingHostGroup hostGroup : bindingHostGroups) { - Map<String, Object> mapGroupProps = new HashMap<String, Object>(); + Map<String, Object> mapGroupProps = new HashMap<>(); mapGroupProps.put(BINDING_HOST_GROUPS_NAME_PROPERTY_ID, hostGroup.getName()); mapGroupProps.put(BINDING_HOST_GROUPS_HOSTS_PROPERTY_ID, hostGroup.getHosts()); listBindingGroupProps.add(mapGroupProps); @@ -145,7 +145,7 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider }); notifyCreate(Resource.Type.Recommendation, request); - Set<Resource> resources = new HashSet<Resource>(Arrays.asList(recommendation)); + Set<Resource> resources = new HashSet<>(Arrays.asList(recommendation)); return new RequestStatusImpl(null, resources); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java index dc1ce01..116c7c7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java @@ -78,7 +78,7 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro /** * The key property ids for a Remote Cluster resource. */ - private static Map<Resource.Type, String> keyPropertyIds = new HashMap<Resource.Type, String>(); + private static Map<Resource.Type, String> keyPropertyIds = new HashMap<>(); static { keyPropertyIds.put(Resource.Type.RemoteCluster, CLUSTER_NAME_PROPERTY_ID); } @@ -86,7 +86,7 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro /** * The property ids for a Remote Cluster resource. */ - private static Set<String> propertyIds = new HashSet<String>(); + private static Set<String> propertyIds = new HashSet<>(); static { propertyIds.add(CLUSTER_NAME_PROPERTY_ID); propertyIds.add(CLUSTER_ID_PROPERTY_ID); @@ -124,7 +124,7 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro @Override protected Set<String> getPKPropertyIds() { - return new HashSet<String>(keyPropertyIds.values()); + return new HashSet<>(keyPropertyIds.values()); } @Override @@ -139,7 +139,7 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro @Override public Set<Resource> getResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); Set<String> requestedIds = getRequestPropertyIds(request, predicate); Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate); @@ -173,7 +173,7 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro setResourceProperty(resource, CLUSTER_ID_PROPERTY_ID, cluster.getId(), requestedIds); setResourceProperty(resource, CLUSTER_URL_PROPERTY_ID, cluster.getUrl(), requestedIds); setResourceProperty(resource, USERNAME_PROPERTY_ID, cluster.getUsername(), requestedIds); - ArrayList<String> services = new ArrayList<String>(); + ArrayList<String> services = new ArrayList<>(); for (RemoteAmbariClusterServiceEntity remoteClusterServiceEntity : cluster.getServices()) { services.add(remoteClusterServiceEntity.getServiceName()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java index 5f3607a..6665087 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java @@ -113,7 +113,7 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RepositoryRequest> requests = new HashSet<RepositoryRequest>(); + final Set<RepositoryRequest> requests = new HashSet<>(); Iterator<Map<String,Object>> iterator = request.getProperties().iterator(); if (iterator.hasNext()) { @@ -138,7 +138,7 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RepositoryRequest> requests = new HashSet<RepositoryRequest>(); + final Set<RepositoryRequest> requests = new HashSet<>(); if (predicate == null) { requests.add(getRequest(Collections.<String, Object>emptyMap())); @@ -156,7 +156,7 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid } }); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (RepositoryResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.Repository); @@ -194,7 +194,7 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid public RequestStatus createResources(Request request) throws SystemException, UnsupportedPropertyException, ResourceAlreadyExistsException, NoSuchParentResourceException { final String validateOnlyProperty = request.getRequestInfoProperties().get(RepositoryResourceDefinition.VALIDATE_ONLY_DIRECTIVE); if (BooleanUtils.toBoolean(validateOnlyProperty)) { - final Set<RepositoryRequest> requests = new HashSet<RepositoryRequest>(); + final Set<RepositoryRequest> requests = new HashSet<>(); final Iterator<Map<String,Object>> iterator = request.getProperties().iterator(); if (iterator.hasNext()) { for (Map<String, Object> propertyMap : request.getProperties()) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java index 83edd73..d2f3f8d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java @@ -226,12 +226,12 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc @Override protected Set<Resource> getResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<Resource> resources = new HashSet<Resource>(); + final Set<Resource> resources = new HashSet<>(); final Set<String> requestedIds = getRequestPropertyIds(request, predicate); final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate); - List<RepositoryVersionEntity> requestedEntities = new ArrayList<RepositoryVersionEntity>(); + List<RepositoryVersionEntity> requestedEntities = new ArrayList<>(); for (Map<String, Object> propertyMap: propertyMaps) { final StackId stackId = getStackInformationFromUrl(propertyMap); @@ -384,7 +384,7 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate); - final List<RepositoryVersionEntity> entitiesToBeRemoved = new ArrayList<RepositoryVersionEntity>(); + final List<RepositoryVersionEntity> entitiesToBeRemoved = new ArrayList<>(); for (Map<String, Object> propertyMap : propertyMaps) { final Long id; try { @@ -456,7 +456,7 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc final String requiredStackId = requiredStack.getStackId(); // List of all repo urls that are already added at stack - Set<String> existingRepoUrls = new HashSet<String>(); + Set<String> existingRepoUrls = new HashSet<>(); List<RepositoryVersionEntity> existingRepoVersions = dao.findByStack(requiredStack); for (RepositoryVersionEntity existingRepoVersion : existingRepoVersions) { for (OperatingSystemEntity operatingSystemEntity : existingRepoVersion.getOperatingSystems()) { @@ -469,12 +469,12 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc } // check that repositories contain only supported operating systems - final Set<String> osSupported = new HashSet<String>(); + final Set<String> osSupported = new HashSet<>(); for (OperatingSystemInfo osInfo: metaInfo.getOperatingSystems(requiredStackName, requiredStackVersion)) { osSupported.add(osInfo.getOsType()); } - final Set<String> osRepositoryVersion = new HashSet<String>(); + final Set<String> osRepositoryVersion = new HashSet<>(); for (OperatingSystemEntity os: repositoryVersion.getOperatingSystems()) { osRepositoryVersion.add(os.getOsType()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java index 371a6b1..4028e35 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceFilter.java @@ -26,7 +26,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; public class RequestResourceFilter { private String serviceName; private String componentName; - private final List<String> hostNames = new ArrayList<String>(); + private final List<String> hostNames = new ArrayList<>(); public RequestResourceFilter() { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java index 0690ee7..9704b33 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java @@ -124,8 +124,8 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider protected static final String INPUTS_ID = "parameters"; protected static final String EXLUSIVE_ID = "exclusive"; private static Set<String> pkPropertyIds = - new HashSet<String>(Arrays.asList(new String[]{ - REQUEST_ID_PROPERTY_ID})); + new HashSet<>(Arrays.asList(new String[]{ + REQUEST_ID_PROPERTY_ID})); private PredicateCompiler predicateCompiler = new PredicateCompiler(); @@ -255,7 +255,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { Set<String> requestedIds = getRequestPropertyIds(request, predicate); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); String maxResultsRaw = request.getRequestInfoProperties().get(BaseRequest.PAGE_SIZE_PROPERTY_KEY); String ascOrderRaw = request.getRequestInfoProperties().get(BaseRequest.ASC_ORDER_PROPERTY_KEY); @@ -298,7 +298,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { AmbariManagementController amc = getManagementController(); - final Set<RequestRequest> requests = new HashSet<RequestRequest>(); + final Set<RequestRequest> requests = new HashSet<>(); Iterator<Map<String,Object>> iterator = requestInfo.getProperties().iterator(); if (iterator.hasNext()) { @@ -308,7 +308,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider } // Validate List<org.apache.ambari.server.actionmanager.Request> targets = - new ArrayList<org.apache.ambari.server.actionmanager.Request>(); + new ArrayList<>(); for (RequestRequest updateRequest : requests) { ActionManager actionManager = amc.getActionManager(); List<org.apache.ambari.server.actionmanager.Request> internalRequests = @@ -414,7 +414,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider Object resourceFilterObj = propertyMap.get(REQUEST_RESOURCE_FILTER_ID); if (resourceFilterObj != null && resourceFilterObj instanceof HashSet) { resourceFilters = (HashSet<Map<String, Object>>) resourceFilterObj; - resourceFilterList = new ArrayList<RequestResourceFilter>(); + resourceFilterList = new ArrayList<>(); for (Map<String, Object> resourceMap : resourceFilters) { resourceFilterList.addAll(parseRequestResourceFilter(resourceMap, @@ -428,7 +428,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider operationLevel = new RequestOperationLevel(requestInfoProperties); } - Map<String, String> params = new HashMap<String, String>(); + Map<String, String> params = new HashMap<>(); String keyPrefix = INPUTS_ID + "/"; for (String key : requestInfoProperties.keySet()) { if (key.startsWith(keyPrefix)) { @@ -466,9 +466,9 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider String componentName = (String) resourceMap.get(COMPONENT_ID); String hostsPredicate = (String) resourceMap.get(HOSTS_PREDICATE); Object hostListStr = resourceMap.get(HOSTS_ID); - List<String> hostList = Collections.<String>emptyList(); + List<String> hostList = Collections.emptyList(); if (hostListStr != null) { - hostList = new ArrayList<String>(); + hostList = new ArrayList<>(); for (String hostName : ((String) hostListStr).split(",")) { hostList.add(hostName.trim()); } @@ -486,7 +486,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider ResourceProvider resourceProvider = getResourceProvider(Resource.Type.HostComponent); - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID); propertyIds.add(HOST_COMPONENT_SERVICE_NAME_PROPERTY_ID); propertyIds.add(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID); @@ -601,7 +601,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider Set<String> requestedPropertyIds) throws NoSuchResourceException, NoSuchParentResourceException { - Set<Resource> response = new HashSet<Resource>(); + Set<Resource> response = new HashSet<>(); ActionManager actionManager = getManagementController().getActionManager(); Long clusterId = null; @@ -670,13 +670,13 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider private Collection<Resource> getRequestResources(Long clusterId, String clusterName, List<Long> requestIds, Set<String> requestedPropertyIds) { - Map<Long, Resource> resourceMap = new HashMap<Long, Resource>(); + Map<Long, Resource> resourceMap = new HashMap<>(); List<RequestEntity> requests = s_requestDAO.findByPks(requestIds, true); //todo: this was (and still is) in ActionManager but this class was changed to not use ActionManager recently - List<RequestEntity> topologyRequestEntities = new ArrayList<RequestEntity>(); + List<RequestEntity> topologyRequestEntities = new ArrayList<>(); Collection<? extends org.apache.ambari.server.actionmanager.Request> topologyRequests = topologyManager.getRequests(requestIds); for (org.apache.ambari.server.actionmanager.Request request : topologyRequests) { @@ -685,7 +685,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider // if requests is empty, map is Collections.emptyMap() which can't be added to so create a new map if (requests.isEmpty()) { - requests = new ArrayList<RequestEntity>(); + requests = new ArrayList<>(); } requests.addAll(topologyRequestEntities); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java index 4e3b78a..e435326 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java @@ -115,8 +115,8 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP protected static final String SCHEDULE_END_TIME_PROPERTY_ID = PropertyHelper.getPropertyId(REQUEST_SCHEDULE_SCHEDULE_PROPERTY_ID, "endTime"); - private static Set<String> pkPropertyIds = new HashSet<String>(Arrays - .asList(new String[]{ REQUEST_SCHEDULE_ID_PROPERTY_ID })); + private static Set<String> pkPropertyIds = new HashSet<>(Arrays + .asList(new String[]{REQUEST_SCHEDULE_ID_PROPERTY_ID})); /** * Create a new resource provider for the given management controller. @@ -143,7 +143,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP UnsupportedPropertyException, ResourceAlreadyExistsException, NoSuchParentResourceException { - final Set<RequestScheduleRequest> requests = new HashSet<RequestScheduleRequest>(); + final Set<RequestScheduleRequest> requests = new HashSet<>(); for (Map<String, Object> propertyMap : request.getProperties()) { requests.add(getRequestScheduleRequest(propertyMap)); @@ -159,7 +159,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP notifyCreate(Resource.Type.RequestSchedule, request); - Set<Resource> associatedResources = new HashSet<Resource>(); + Set<Resource> associatedResources = new HashSet<>(); for (RequestScheduleResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.RequestSchedule); resource.setProperty(REQUEST_SCHEDULE_ID_PROPERTY_ID, response.getId()); @@ -174,7 +174,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RequestScheduleRequest> requests = new HashSet<RequestScheduleRequest>(); + final Set<RequestScheduleRequest> requests = new HashSet<>(); for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) { requests.add(getRequestScheduleRequest(propertyMap)); } @@ -188,7 +188,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP }); Set<String> requestedIds = getRequestPropertyIds(request, predicate); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (RequestScheduleResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.RequestSchedule); @@ -244,7 +244,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP NoSuchResourceException, NoSuchParentResourceException { final Set<RequestScheduleRequest> requests = new - HashSet<RequestScheduleRequest>(); + HashSet<>(); Iterator<Map<String,Object>> iterator = request.getProperties().iterator(); if (iterator.hasNext()) { @@ -403,7 +403,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP } Set<RequestScheduleResponse> responses = new - HashSet<RequestScheduleResponse>(); + HashSet<>(); Clusters clusters = getManagementController().getClusters(); RequestExecutionFactory requestExecutionFactory = @@ -472,7 +472,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP Batch batch = request.getBatch(); if (batch != null && !batch.getBatchRequests().isEmpty()) { // Verify requests can be ordered - HashSet<Long> orderIdSet = new HashSet<Long>(); + HashSet<Long> orderIdSet = new HashSet<>(); for (BatchRequest batchRequest : batch.getBatchRequests()) { if (batchRequest.getOrderId() == null) { throw new AmbariException("No order id provided for batch request. " + @@ -491,7 +491,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP (Set<RequestScheduleRequest> requests) throws AmbariException { Set<RequestScheduleResponse> responses = new - HashSet<RequestScheduleResponse>(); + HashSet<>(); if (requests != null) { for (RequestScheduleRequest request : requests) { @@ -563,7 +563,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP Batch batch = new Batch(); BatchSettings batchSettings = new BatchSettings(); - List<BatchRequest> batchRequests = new ArrayList<BatchRequest>(); + List<BatchRequest> batchRequests = new ArrayList<>(); Object batchObject = properties.get(REQUEST_SCHEDULE_BATCH_PROPERTY_ID); if (batchObject != null && batchObject instanceof HashSet<?>) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java index 479482a..c37be91 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestStageContainer.java @@ -232,7 +232,7 @@ public class RequestStageContainer { actionManager.getRequestTasks(id); response.setRequestContext(actionManager.getRequestContext(id)); - List<ShortTaskStatus> tasks = new ArrayList<ShortTaskStatus>(); + List<ShortTaskStatus> tasks = new ArrayList<>(); for (HostRoleCommand hostRoleCommand : hostRoleCommands) { tasks.add(new ShortTaskStatus(hostRoleCommand)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java index 186485c..78eb80e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProvider.java @@ -63,18 +63,18 @@ public class RoleAuthorizationResourceProvider extends ReadOnlyResourceProvider static { Set<String> set; - set = new HashSet<String>(); + set = new HashSet<>(); set.add(AUTHORIZATION_ID_PROPERTY_ID); set.add(PERMISSION_ID_PROPERTY_ID); PK_PROPERTY_IDS = Collections.unmodifiableSet(set); - set = new HashSet<String>(); + set = new HashSet<>(); set.add(AUTHORIZATION_ID_PROPERTY_ID); set.add(PERMISSION_ID_PROPERTY_ID); set.add(AUTHORIZATION_NAME_PROPERTY_ID); PROPERTY_IDS = Collections.unmodifiableSet(set); - HashMap<Type, String> map = new HashMap<Type, String>(); + HashMap<Type, String> map = new HashMap<>(); map.put(Type.Permission, PERMISSION_ID_PROPERTY_ID); map.put(Type.RoleAuthorization, AUTHORIZATION_ID_PROPERTY_ID); KEY_PROPERTY_IDS = Collections.unmodifiableMap(map); @@ -104,7 +104,7 @@ public class RoleAuthorizationResourceProvider extends ReadOnlyResourceProvider throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { Set<String> requestedIds = getRequestPropertyIds(request, predicate); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); Set<Map<String, Object>> propertyMaps; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProvider.java index 5f52e13..433c1fa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentPropertyProvider.java @@ -99,7 +99,7 @@ public class RootServiceComponentPropertyProvider extends BaseProvider implement private final static Logger LOG = LoggerFactory.getLogger(RootServiceComponentPropertyProvider.class); static { - Set<String> propertyIds = new HashSet<String>(); + Set<String> propertyIds = new HashSet<>(); propertyIds.add(JCE_POLICY_PROPERTY_ID); propertyIds.add(CIPHER_PROPERTIES_PROPERTY_ID); SUPPORTED_PROPERTY_IDS = Collections.unmodifiableSet(propertyIds); @@ -110,7 +110,7 @@ public class RootServiceComponentPropertyProvider extends BaseProvider implement * <p/> * This is cached in memory after the first time it is needed. */ - private static final Map<String, Integer> CACHED_CIPHER_MAX_KEY_LENGTHS = new HashMap<String, Integer>(); + private static final Map<String, Integer> CACHED_CIPHER_MAX_KEY_LENGTHS = new HashMap<>(); /** * Constructor http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java index 14385c2..fe95210 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java @@ -57,8 +57,8 @@ public class RootServiceComponentResourceProvider extends public static final String PROPERTIES_SERVER_CLOCK = PropertyHelper .getPropertyId("RootServiceComponents", "server_clock"); - private Set<String> pkPropertyIds = new HashSet<String>( - Arrays.asList(new String[] { SERVICE_NAME_PROPERTY_ID, COMPONENT_NAME_PROPERTY_ID })); + private Set<String> pkPropertyIds = new HashSet<>( + Arrays.asList(new String[]{SERVICE_NAME_PROPERTY_ID, COMPONENT_NAME_PROPERTY_ID})); protected RootServiceComponentResourceProvider(Set<String> propertyIds, Map<Type, String> keyPropertyIds, @@ -71,7 +71,7 @@ public class RootServiceComponentResourceProvider extends throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RootServiceComponentRequest> requests = new HashSet<RootServiceComponentRequest>(); + final Set<RootServiceComponentRequest> requests = new HashSet<>(); if (predicate == null) { requests.add(getRequest(Collections.<String, Object>emptyMap())); @@ -90,7 +90,7 @@ public class RootServiceComponentResourceProvider extends } }); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (RootServiceComponentResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.RootServiceComponent); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java index 79c773e..c2fb844 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java @@ -57,8 +57,8 @@ public class RootServiceHostComponentResourceProvider extends .getPropertyId("RootServiceHostComponents", "properties"); - private Set<String> pkPropertyIds = new HashSet<String>( - Arrays.asList(new String[] { SERVICE_NAME_PROPERTY_ID, HOST_NAME_PROPERTY_ID, COMPONENT_NAME_PROPERTY_ID })); + private Set<String> pkPropertyIds = new HashSet<>( + Arrays.asList(new String[]{SERVICE_NAME_PROPERTY_ID, HOST_NAME_PROPERTY_ID, COMPONENT_NAME_PROPERTY_ID})); public RootServiceHostComponentResourceProvider(Set<String> propertyIds, @@ -73,7 +73,7 @@ public class RootServiceHostComponentResourceProvider extends throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RootServiceHostComponentRequest> requests = new HashSet<RootServiceHostComponentRequest>(); + final Set<RootServiceHostComponentRequest> requests = new HashSet<>(); if (predicate == null) { requests.add(getRequest(Collections.<String, Object>emptyMap())); @@ -92,7 +92,7 @@ public class RootServiceHostComponentResourceProvider extends } }); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (RootServiceHostComponentResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.RootServiceHostComponent); @@ -135,7 +135,7 @@ public class RootServiceHostComponentResourceProvider extends // Get the root service host components for the given set of requests protected Set<RootServiceHostComponentResponse> getRootServiceHostComponents( Set<RootServiceHostComponentRequest> requests) throws AmbariException { - Set<RootServiceHostComponentResponse> response = new HashSet<RootServiceHostComponentResponse>(); + Set<RootServiceHostComponentResponse> response = new HashSet<>(); for (RootServiceHostComponentRequest request : requests) { String serviceName = request.getServiceName(); try { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java index cb1b1ce..80f720c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java @@ -43,8 +43,8 @@ public class RootServiceResourceProvider extends ReadOnlyResourceProvider { public static final String SERVICE_NAME_PROPERTY_ID = PropertyHelper .getPropertyId("RootService", "service_name"); - private Set<String> pkPropertyIds = new HashSet<String>( - Arrays.asList(new String[] { SERVICE_NAME_PROPERTY_ID })); + private Set<String> pkPropertyIds = new HashSet<>( + Arrays.asList(new String[]{SERVICE_NAME_PROPERTY_ID})); protected RootServiceResourceProvider(Set<String> propertyIds, Map<Type, String> keyPropertyIds, @@ -57,7 +57,7 @@ public class RootServiceResourceProvider extends ReadOnlyResourceProvider { throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<RootServiceRequest> requests = new HashSet<RootServiceRequest>(); + final Set<RootServiceRequest> requests = new HashSet<>(); if (predicate == null) { requests.add(getRequest(Collections.<String, Object>emptyMap())); @@ -76,7 +76,7 @@ public class RootServiceResourceProvider extends ReadOnlyResourceProvider { } }); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (RootServiceResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.RootService); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java index e5ca389..e7dbbc0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java @@ -67,12 +67,12 @@ public class ServiceConfigVersionResourceProvider extends /** * The property ids for a service configuration resource. */ - private static final Set<String> PROPERTY_IDS = new HashSet<String>(); + private static final Set<String> PROPERTY_IDS = new HashSet<>(); /** * The key property ids for a service configuration resource. */ - private static final Map<Resource.Type, String> KEY_PROPERTY_IDS = new HashMap<Resource.Type, String>(); + private static final Map<Resource.Type, String> KEY_PROPERTY_IDS = new HashMap<>(); static { // properties @@ -101,9 +101,9 @@ public class ServiceConfigVersionResourceProvider extends * The primary key property ids for the service config version resource type. */ private static Set<String> pkPropertyIds = - new HashSet<String>(Arrays.asList(new String[]{ - SERVICE_CONFIG_VERSION_CLUSTER_NAME_PROPERTY_ID, - SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID})); + new HashSet<>(Arrays.asList(new String[]{ + SERVICE_CONFIG_VERSION_CLUSTER_NAME_PROPERTY_ID, + SERVICE_CONFIG_VERSION_SERVICE_NAME_PROPERTY_ID})); // ----- Constructors ------------------------------------------------------ @@ -135,7 +135,7 @@ public class ServiceConfigVersionResourceProvider extends @Override public Set<Resource> getResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<ServiceConfigVersionRequest> requests = new HashSet<ServiceConfigVersionRequest>(); + final Set<ServiceConfigVersionRequest> requests = new HashSet<>(); for (Map<String, Object> properties : getPropertyMaps(predicate)) { requests.add(createRequest(properties)); } @@ -147,7 +147,7 @@ public class ServiceConfigVersionResourceProvider extends } }); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (ServiceConfigVersionResponse response : responses) { String clusterName = response.getClusterName(); List<ConfigurationResponse> configurationResponses = response.getConfigurations(); @@ -190,7 +190,7 @@ public class ServiceConfigVersionResourceProvider extends if (propertyIds.isEmpty()) { return propertyIds; } - Set<String> unsupportedProperties = new HashSet<String>(); + Set<String> unsupportedProperties = new HashSet<>(); for (String propertyId : propertyIds) { if (!propertyId.equals("cluster_name") && !propertyId.equals("service_config_version") && @@ -224,10 +224,10 @@ public class ServiceConfigVersionResourceProvider extends } private List<Map<String, Object>> convertToSubResources(final String clusterName, List<ConfigurationResponse> configs) { - List<Map<String, Object>> result = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> result = new ArrayList<>(); for (final ConfigurationResponse config : configs) { - Map<String, Object> subResourceMap = new LinkedHashMap<String, Object>(); - Map<String,String> configMap = new HashMap<String, String>(); + Map<String, Object> subResourceMap = new LinkedHashMap<>(); + Map<String,String> configMap = new HashMap<>(); String stackId = config.getStackId().getStackId(); @@ -238,7 +238,7 @@ public class ServiceConfigVersionResourceProvider extends subResourceMap.put("type", config.getType()); subResourceMap.put("tag", config.getVersionTag()); subResourceMap.put("version", config.getVersion()); - subResourceMap.put("properties", new TreeMap<String, String>(config.getConfigs())); + subResourceMap.put("properties", new TreeMap<>(config.getConfigs())); subResourceMap.put("properties_attributes", config.getConfigAttributes()); result.add(subResourceMap); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java index 0cc1745..6556852 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java @@ -110,9 +110,9 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider "params/start_dependencies"; private static Set<String> pkPropertyIds = - new HashSet<String>(Arrays.asList(new String[]{ - SERVICE_CLUSTER_NAME_PROPERTY_ID, - SERVICE_SERVICE_NAME_PROPERTY_ID})); + new HashSet<>(Arrays.asList(new String[]{ + SERVICE_CLUSTER_NAME_PROPERTY_ID, + SERVICE_SERVICE_NAME_PROPERTY_ID})); private MaintenanceStateHelper maintenanceStateHelper; @@ -175,7 +175,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider protected Set<Resource> getResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<ServiceRequest> requests = new HashSet<ServiceRequest>(); + final Set<ServiceRequest> requests = new HashSet<>(); for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) { requests.add(getRequest(propertyMap)); @@ -189,7 +189,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider }); Set<String> requestedIds = getRequestPropertyIds(request, predicate); - Set<Resource> resources = new HashSet<Resource>(); + Set<Resource> resources = new HashSet<>(); for (ServiceResponse response : responses) { Resource resource = new ResourceImpl(Resource.Type.Service); @@ -243,7 +243,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException { - final Set<ServiceRequest> requests = new HashSet<ServiceRequest>(); + final Set<ServiceRequest> requests = new HashSet<>(); for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) { requests.add(getRequest(propertyMap)); } @@ -265,7 +265,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider if (propertyIds.isEmpty()) { return propertyIds; } - Set<String> unsupportedProperties = new HashSet<String>(); + Set<String> unsupportedProperties = new HashSet<>(); for (String propertyId : propertyIds) { if (!propertyId.equals("config")) { @@ -291,7 +291,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider private RequestStageContainer doUpdateResources(final RequestStageContainer stages, final Request request, Predicate predicate) throws UnsupportedPropertyException, SystemException, NoSuchResourceException, NoSuchParentResourceException { - final Set<ServiceRequest> requests = new HashSet<ServiceRequest>(); + final Set<ServiceRequest> requests = new HashSet<>(); RequestStageContainer requestStages = null; Iterator<Map<String,Object>> iterator = request.getProperties().iterator(); @@ -407,7 +407,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider // Get services from the given set of requests. protected Set<ServiceResponse> getServices(Set<ServiceRequest> requests) throws AmbariException { - Set<ServiceResponse> response = new HashSet<ServiceResponse>(); + Set<ServiceResponse> response = new HashSet<>(); for (ServiceRequest request : requests) { try { response.addAll(getServices(request)); @@ -440,7 +440,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider throw new ParentObjectNotFoundException("Parent Cluster resource doesn't exist", e); } - Set<ServiceResponse> response = new HashSet<ServiceResponse>(); + Set<ServiceResponse> response = new HashSet<>(); if (request.getServiceName() != null) { Service s = cluster.getService(request.getServiceName()); response.add(s.convertToResponse()); @@ -485,17 +485,17 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider } Map<State, List<Service>> changedServices - = new EnumMap<State, List<Service>>(State.class); + = new EnumMap<>(State.class); Map<State, List<ServiceComponent>> changedComps = - new EnumMap<State, List<ServiceComponent>>(State.class); + new EnumMap<>(State.class); Map<String, Map<State, List<ServiceComponentHost>>> changedScHosts = - new HashMap<String, Map<State, List<ServiceComponentHost>>>(); + new HashMap<>(); Collection<ServiceComponentHost> ignoredScHosts = - new ArrayList<ServiceComponentHost>(); + new ArrayList<>(); - Set<String> clusterNames = new HashSet<String>(); - Map<String, Set<String>> serviceNames = new HashMap<String, Set<String>>(); - Set<State> seenNewStates = new HashSet<State>(); + Set<String> clusterNames = new HashSet<>(); + Map<String, Set<String>> serviceNames = new HashMap<>(); + Set<State> seenNewStates = new HashSet<>(); Map<Service, Boolean> serviceCredentialStoreEnabledMap = new HashMap<>(); // Determine operation level @@ -657,7 +657,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider } if (startDependencies && changedServices.containsKey(State.STARTED)) { - HashSet<Service> depServices = new HashSet<Service>(); + HashSet<Service> depServices = new HashSet<>(); for (Service service : changedServices.get(State.STARTED)) { RoleCommandOrder rco = controller.getRoleCommandOrder(service.getCluster()); Set<Service> dependencies = rco.getTransitiveServices(service, RoleCommand.START); @@ -837,7 +837,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider Clusters clusters = getManagementController().getClusters(); - Set<Service> removable = new HashSet<Service>(); + Set<Service> removable = new HashSet<>(); for (ServiceRequest serviceRequest : request) { if (StringUtils.isEmpty(serviceRequest.getClusterName()) || StringUtils.isEmpty(serviceRequest.getServiceName())) { @@ -928,14 +928,14 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider * @param requestedIds relevant request property ids */ private Map<String, Object> getServiceSpecificProperties(String clusterName, String serviceName, Set<String> requestedIds) { - Map<String, Object> serviceSpecificProperties = new HashMap<String, Object>(); + Map<String, Object> serviceSpecificProperties = new HashMap<>(); if (serviceName.equals("KERBEROS")) { // Only include details on whether the KDC administrator credentials are set and correct if // implicitly (Service/attributes) or explicitly (Service/attributes/kdc_...) queried if (requestedIds.contains(SERVICE_ATTRIBUTES_PROPERTY_ID) || isPropertyCategoryRequested(SERVICE_ATTRIBUTES_PROPERTY_ID, requestedIds) || isPropertyEntryRequested(SERVICE_ATTRIBUTES_PROPERTY_ID, requestedIds)) { - Map<String, String> kerberosAttributes = new HashMap<String, String>(); + Map<String, String> kerberosAttributes = new HashMap<>(); String kdcValidationResult = "OK"; String failureDetails = ""; try { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java index 29ddf12..eecf1af 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SimplifyingPredicateVisitor.java @@ -107,7 +107,7 @@ public class SimplifyingPredicateVisitor implements PredicateVisitor { @Override public void acceptArrayPredicate(ArrayPredicate arrayPredicate) { - List<Predicate> predicateList = new LinkedList<Predicate>(); + List<Predicate> predicateList = new LinkedList<>(); boolean hasOrs = false; Predicate[] predicates = arrayPredicate.getPredicates(); @@ -123,7 +123,7 @@ public class SimplifyingPredicateVisitor implements PredicateVisitor { // distribute so that A && ( B || C ) becomes ( A && B ) || ( A && C ) if (hasOrs && arrayPredicate instanceof AndPredicate) { int size = predicateList.size(); - List<Predicate> andPredicateList = new LinkedList<Predicate>(); + List<Predicate> andPredicateList = new LinkedList<>(); for (int i = 0; i < size; ++i) { for (int j = i + 1; j < size; ++j) { @@ -161,7 +161,7 @@ public class SimplifyingPredicateVisitor implements PredicateVisitor { } private static List<Predicate> distributeOr(OrPredicate orPredicate, Predicate other) { - List<Predicate> andPredicateList = new LinkedList<Predicate>(); + List<Predicate> andPredicateList = new LinkedList<>(); OrPredicate otherOr = null; if (other instanceof OrPredicate) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SortRequestImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SortRequestImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SortRequestImpl.java index 2ed365a..a2e7c8e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SortRequestImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SortRequestImpl.java @@ -37,7 +37,7 @@ public class SortRequestImpl implements SortRequest { @Override public List<String> getPropertyIds() { - List<String> propertyIds = new ArrayList<String>(); + List<String> propertyIds = new ArrayList<>(); for (SortRequestProperty property : properties) { propertyIds.add(property.getPropertyId()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java index 034866e..6060187 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java @@ -62,24 +62,24 @@ public class Stack { * Map of service name to components */ private Map<String, Collection<String>> serviceComponents = - new HashMap<String, Collection<String>>(); + new HashMap<>(); /** * Map of component to service */ - private Map<String, String> componentService = new HashMap<String, String>(); + private Map<String, String> componentService = new HashMap<>(); /** * Map of component to dependencies */ private Map<String, Collection<DependencyInfo>> dependencies = - new HashMap<String, Collection<DependencyInfo>>(); + new HashMap<>(); /** * Map of dependency to conditional service */ private Map<DependencyInfo, String> dependencyConditionalServiceMap = - new HashMap<DependencyInfo, String>(); + new HashMap<>(); /** * Map of database component name to configuration property which indicates whether @@ -87,46 +87,46 @@ public class Stack { * If the value of the config property starts with 'New', the database is determined * to be managed, otherwise it is non-managed. */ - private Map<String, String> dbDependencyInfo = new HashMap<String, String>(); + private Map<String, String> dbDependencyInfo = new HashMap<>(); /** * Map of component to required cardinality */ - private Map<String, String> cardinalityRequirements = new HashMap<String, String>(); + private Map<String, String> cardinalityRequirements = new HashMap<>(); //todo: instead of all these maps from component -> * , //todo: we should use a Component object with all of these attributes - private Set<String> masterComponents = new HashSet<String>(); + private Set<String> masterComponents = new HashSet<>(); /** * Map of component to auto-deploy information */ private Map<String, AutoDeployInfo> componentAutoDeployInfo = - new HashMap<String, AutoDeployInfo>(); + new HashMap<>(); /** * Map of service to config type properties */ private Map<String, Map<String, Map<String, ConfigProperty>>> serviceConfigurations = - new HashMap<String, Map<String, Map<String, ConfigProperty>>>(); + new HashMap<>(); /** * Map of service to required type properties */ private Map<String, Map<String, Map<String, ConfigProperty>>> requiredServiceConfigurations = - new HashMap<String, Map<String, Map<String, ConfigProperty>>>(); + new HashMap<>(); /** * Map of service to config type properties */ private Map<String, Map<String, ConfigProperty>> stackConfigurations = - new HashMap<String, Map<String, ConfigProperty>>(); + new HashMap<>(); /** * Map of service to set of excluded config types */ private Map<String, Set<String>> excludedConfigurationTypes = - new HashMap<String, Set<String>>(); + new HashMap<>(); /** * Ambari Management Controller, used to obtain Stack definitions @@ -226,9 +226,9 @@ public class Stack { * @return map of service to associated components */ public Map<String, Collection<String>> getComponents() { - Map<String, Collection<String>> serviceComponents = new HashMap<String, Collection<String>>(); + Map<String, Collection<String>> serviceComponents = new HashMap<>(); for (String service : getServices()) { - Collection<String> components = new HashSet<String>(); + Collection<String> components = new HashSet<>(); components.addAll(getComponents(service)); serviceComponents.put(service, components); } @@ -277,7 +277,7 @@ public class Stack { * @return collection of all configuration types for the specified service */ public Collection<String> getConfigurationTypes(String service) { - Set<String> serviceTypes = new HashSet<String>(serviceConfigurations.get(service).keySet()); + Set<String> serviceTypes = new HashSet<>(serviceConfigurations.get(service).keySet()); serviceTypes.removeAll(getExcludedConfigurationTypes(service)); return serviceTypes; @@ -305,7 +305,7 @@ public class Stack { * @return map of property names to values for the specified service and configuration type */ public Map<String, String> getConfigurationProperties(String service, String type) { - Map<String, String> configMap = new HashMap<String, String>(); + Map<String, String> configMap = new HashMap<>(); Map<String, ConfigProperty> configProperties = serviceConfigurations.get(service).get(type); if (configProperties != null) { for (Map.Entry<String, ConfigProperty> configProperty : configProperties.entrySet()) { @@ -327,7 +327,7 @@ public class Stack { * @return collection of all required properties for the given service */ public Collection<ConfigProperty> getRequiredConfigurationProperties(String service) { - Collection<ConfigProperty> requiredConfigProperties = new HashSet<ConfigProperty>(); + Collection<ConfigProperty> requiredConfigProperties = new HashSet<>(); Map<String, Map<String, ConfigProperty>> serviceProperties = requiredServiceConfigurations.get(service); if (serviceProperties != null) { for (Map.Entry<String, Map<String, ConfigProperty>> typePropertiesEntry : serviceProperties.entrySet()) { @@ -346,7 +346,7 @@ public class Stack { * @return collection of required properties for the given service and property type */ public Collection<ConfigProperty> getRequiredConfigurationProperties(String service, PropertyInfo.PropertyType propertyType) { - Collection<ConfigProperty> matchingProperties = new HashSet<ConfigProperty>(); + Collection<ConfigProperty> matchingProperties = new HashSet<>(); Map<String, Map<String, ConfigProperty>> requiredProperties = requiredServiceConfigurations.get(service); if (requiredProperties != null) { for (Map.Entry<String, Map<String, ConfigProperty>> typePropertiesEntry : requiredProperties.entrySet()) { @@ -371,7 +371,7 @@ public class Stack { //todo public Map<String, String> getStackConfigurationProperties(String type) { - Map<String, String> configMap = new HashMap<String, String>(); + Map<String, String> configMap = new HashMap<>(); Map<String, ConfigProperty> configProperties = stackConfigurations.get(type); if (configProperties != null) { for (Map.Entry<String, ConfigProperty> configProperty : configProperties.entrySet()) { @@ -398,7 +398,7 @@ public class Stack { * for the specified service and configuration type */ public Map<String, Map<String, String>> getConfigurationAttributes(String service, String type) { - Map<String, Map<String, String>> attributesMap = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> attributesMap = new HashMap<>(); Map<String, ConfigProperty> configProperties = serviceConfigurations.get(service).get(type); if (configProperties != null) { for (Map.Entry<String, ConfigProperty> configProperty : configProperties.entrySet()) { @@ -411,7 +411,7 @@ public class Stack { if (attributeValue != null) { Map<String, String> attributes = attributesMap.get(attributeName); if (attributes == null) { - attributes = new HashMap<String, String>(); + attributes = new HashMap<>(); attributesMap.put(attributeName, attributes); } attributes.put(propertyName, attributeValue); @@ -425,7 +425,7 @@ public class Stack { //todo: public Map<String, Map<String, String>> getStackConfigurationAttributes(String type) { - Map<String, Map<String, String>> attributesMap = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> attributesMap = new HashMap<>(); Map<String, ConfigProperty> configProperties = stackConfigurations.get(type); if (configProperties != null) { for (Map.Entry<String, ConfigProperty> configProperty : configProperties.entrySet()) { @@ -437,7 +437,7 @@ public class Stack { String attributeValue = propertyAttribute.getValue(); Map<String, String> attributes = attributesMap.get(attributeName); if (attributes == null) { - attributes = new HashMap<String, String>(); + attributes = new HashMap<>(); attributesMap.put(attributeName, attributes); } attributes.put(propertyName, attributeValue); @@ -467,7 +467,7 @@ public class Stack { * @return collection of services which contain the specified components */ public Collection<String> getServicesForComponents(Collection<String> components) { - Set<String> services = new HashSet<String>(); + Set<String> services = new HashSet<>(); for (String component : components) { services.add(getServiceForComponent(component)); } @@ -542,15 +542,15 @@ public class Stack { } public Configuration getConfiguration(Collection<String> services) { - Map<String, Map<String, Map<String, String>>> attributes = new HashMap<String, Map<String, Map<String, String>>>(); - Map<String, Map<String, String>> properties = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, Map<String, String>>> attributes = new HashMap<>(); + Map<String, Map<String, String>> properties = new HashMap<>(); for (String service : services) { Collection<String> serviceConfigTypes = getConfigurationTypes(service); for (String type : serviceConfigTypes) { Map<String, String> typeProps = properties.get(type); if (typeProps == null) { - typeProps = new HashMap<String, String>(); + typeProps = new HashMap<>(); properties.put(type, typeProps); } typeProps.putAll(getConfigurationProperties(service, type)); @@ -565,7 +565,7 @@ public class Stack { String attributeName = attribute.getKey(); Map<String, String> attributeProps = typeAttributes.get(attributeName); if (attributeProps == null) { - attributeProps = new HashMap<String, String>(); + attributeProps = new HashMap<>(); typeAttributes.put(attributeName, attributeProps); } attributeProps.putAll(attribute.getValue()); @@ -577,14 +577,14 @@ public class Stack { } public Configuration getConfiguration() { - Map<String, Map<String, Map<String, String>>> stackAttributes = new HashMap<String, Map<String, Map<String, String>>>(); - Map<String, Map<String, String>> stackConfigs = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, Map<String, String>>> stackAttributes = new HashMap<>(); + Map<String, Map<String, String>> stackConfigs = new HashMap<>(); for (String service : getServices()) { for (String type : getAllConfigurationTypes(service)) { Map<String, String> typeProps = stackConfigs.get(type); if (typeProps == null) { - typeProps = new HashMap<String, String>(); + typeProps = new HashMap<>(); stackConfigs.put(type, typeProps); } typeProps.putAll(getConfigurationProperties(service, type)); @@ -599,7 +599,7 @@ public class Stack { String attributeName = attribute.getKey(); Map<String, String> attributes = typeAttrs.get(attributeName); if (attributes == null) { - attributes = new HashMap<String, String>(); + attributes = new HashMap<>(); typeAttrs.put(attributeName, attributes); } attributes.putAll(attribute.getValue()); @@ -618,7 +618,7 @@ public class Stack { * @throws AmbariException an exception occurred getting components from the stack definition */ private void parseComponents(String service) throws AmbariException{ - Collection<String> componentSet = new HashSet<String>(); + Collection<String> componentSet = new HashSet<>(); Set<StackServiceComponentResponse> components = controller.getStackComponents( Collections.singleton(new StackServiceComponentRequest(name, version, service, null))); @@ -661,8 +661,8 @@ public class Stack { */ private void parseConfigurations(StackServiceResponse stackService) throws AmbariException { String service = stackService.getServiceName(); - Map<String, Map<String, ConfigProperty>> mapServiceConfig = new HashMap<String, Map<String, ConfigProperty>>(); - Map<String, Map<String, ConfigProperty>> mapRequiredServiceConfig = new HashMap<String, Map<String, ConfigProperty>>(); + Map<String, Map<String, ConfigProperty>> mapServiceConfig = new HashMap<>(); + Map<String, Map<String, ConfigProperty>> mapRequiredServiceConfig = new HashMap<>(); serviceConfigurations.put(service, mapServiceConfig); @@ -681,7 +681,7 @@ public class Stack { Map<String, ConfigProperty> mapTypeConfig = mapServiceConfig.get(type); if (mapTypeConfig == null) { - mapTypeConfig = new HashMap<String, ConfigProperty>(); + mapTypeConfig = new HashMap<>(); mapServiceConfig.put(type, mapTypeConfig); } @@ -689,7 +689,7 @@ public class Stack { if (config.isRequired()) { Map<String, ConfigProperty> requiredTypeConfig = mapRequiredServiceConfig.get(type); if (requiredTypeConfig == null) { - requiredTypeConfig = new HashMap<String, ConfigProperty>(); + requiredTypeConfig = new HashMap<>(); mapRequiredServiceConfig.put(type, requiredTypeConfig); } requiredTypeConfig.put(config.getPropertyName(), configProperty); @@ -718,7 +718,7 @@ public class Stack { Map<String, ConfigProperty> mapTypeConfig = stackConfigurations.get(type); if (mapTypeConfig == null) { - mapTypeConfig = new HashMap<String, ConfigProperty>(); + mapTypeConfig = new HashMap<>(); stackConfigurations.put(type, mapTypeConfig); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java index ba82bf7..9b44a02 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java @@ -149,7 +149,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi private Map<String, Set<String>> calculateHostGroupComponentsMap(Request request) { Set<Map<String, Object>> hostGroups = (Set<Map<String, Object>>) getRequestProperty(request, BLUEPRINT_HOST_GROUPS_PROPERTY); - Map<String, Set<String>> map = new HashMap<String, Set<String>>(); + Map<String, Set<String>> map = new HashMap<>(); if (hostGroups != null) { for (Map<String, Object> hostGroup : hostGroups) { String hostGroupName = (String) hostGroup.get(BLUEPRINT_HOST_GROUPS_NAME_PROPERTY); @@ -157,7 +157,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi Set<Map<String, Object>> componentsSet = (Set<Map<String, Object>>) hostGroup .get(BLUEPRINT_HOST_GROUPS_COMPONENTS_PROPERTY); - Set<String> components = new HashSet<String>(); + Set<String> components = new HashSet<>(); for (Map<String, Object> component : componentsSet) { components.add((String) component.get(BLUEPRINT_HOST_GROUPS_COMPONENTS_NAME_PROPERTY)); } @@ -180,7 +180,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi private Map<String, Set<String>> calculateHostGroupHostsMap(Request request) { Set<Map<String, Object>> bindingHostGroups = (Set<Map<String, Object>>) getRequestProperty( request, BINDING_HOST_GROUPS_PROPERTY); - Map<String, Set<String>> map = new HashMap<String, Set<String>>(); + Map<String, Set<String>> map = new HashMap<>(); if (bindingHostGroups != null) { for (Map<String, Object> hostGroup : bindingHostGroups) { String hostGroupName = (String) hostGroup.get(BINDING_HOST_GROUPS_NAME_PROPERTY); @@ -188,7 +188,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi Set<Map<String, Object>> hostsSet = (Set<Map<String, Object>>) hostGroup .get(BINDING_HOST_GROUPS_HOSTS_PROPERTY); - Set<String> hosts = new HashSet<String>(); + Set<String> hosts = new HashSet<>(); for (Map<String, Object> host : hostsSet) { hosts.add((String) host.get(BINDING_HOST_GROUPS_HOSTS_NAME_PROPERTY)); } @@ -202,7 +202,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi protected List<ChangedConfigInfo> calculateChangedConfigurations(Request request) { List<ChangedConfigInfo> configs = - new LinkedList<ChangedConfigInfo>(); + new LinkedList<>(); HashSet<HashMap<String, String>> changedConfigs = (HashSet<HashMap<String, String>>) getRequestProperty(request, CHANGED_CONFIGURATIONS_PROPERTY); for (HashMap<String, String> props: changedConfigs) { @@ -215,7 +215,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi protected Set<RecommendationResponse.ConfigGroup> calculateConfigGroups(Request request) { Set<RecommendationResponse.ConfigGroup> configGroups = - new HashSet<RecommendationResponse.ConfigGroup>(); + new HashSet<>(); Set<HashMap<String, Object>> configGroupsProperties = (HashSet<HashMap<String, Object>>) getRequestProperty(request, CONFIG_GROUPS_PROPERTY); @@ -269,7 +269,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi protected static final String CONFIGURATIONS_PROPERTY_ID = "recommendations/blueprint/configurations/"; protected Map<String, Map<String, Map<String, String>>> calculateConfigurations(Request request) { - Map<String, Map<String, Map<String, String>>> configurations = new HashMap<String, Map<String, Map<String, String>>>(); + Map<String, Map<String, Map<String, String>>> configurations = new HashMap<>(); Map<String, Object> properties = request.getProperties().iterator().next(); for (String property : properties.keySet()) { if (property.startsWith(CONFIGURATIONS_PROPERTY_ID)) { @@ -282,13 +282,13 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi Map<String, Map<String, String>> siteMap = configurations.get(siteName); if (siteMap == null) { - siteMap = new HashMap<String, Map<String, String>>(); + siteMap = new HashMap<>(); configurations.put(siteName, siteMap); } Map<String, String> propertiesMap = siteMap.get(propertiesProperty); if (propertiesMap == null) { - propertiesMap = new HashMap<String, String>(); + propertiesMap = new HashMap<>(); siteMap.put(propertiesProperty, propertiesMap); } @@ -315,7 +315,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi * missed, etc. */ - Map<String, Set<String>> componentHostsMap = new HashMap<String, Set<String>>(); + Map<String, Set<String>> componentHostsMap = new HashMap<>(); if (null != bindingHostGroups && null != hostGroups) { for (Map.Entry<String, Set<String>> hgComponents : hostGroups.entrySet()) { String hgName = hgComponents.getKey(); @@ -325,7 +325,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi for (String component : components) { Set<String> componentHosts = componentHostsMap.get(component); if (componentHosts == null) { // if was not initialized - componentHosts = new HashSet<String>(); + componentHosts = new HashSet<>(); componentHostsMap.put(component, componentHosts); } componentHosts.addAll(hosts);
