http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java index 0042f53..a77ed75 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java @@ -210,7 +210,7 @@ public class HeartbeatMonitor implements Runnable { * @return list of commands to get status of service components on a concrete host */ public List<StatusCommand> generateStatusCommands(String hostname) throws AmbariException { - List<StatusCommand> cmds = new ArrayList<StatusCommand>(); + List<StatusCommand> cmds = new ArrayList<>(); for (Cluster cl : clusters.getClustersForHost(hostname)) { Map<String, DesiredConfig> desiredConfigs = cl.getDesiredConfigs(); @@ -249,8 +249,8 @@ public class HeartbeatMonitor implements Runnable { StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(), stackId.getStackVersion()); - Map<String, Map<String, String>> configurations = new TreeMap<String, Map<String, String>>(); - Map<String, Map<String, Map<String, String>>> configurationAttributes = new TreeMap<String, Map<String, Map<String, String>>>(); + Map<String, Map<String, String>> configurations = new TreeMap<>(); + Map<String, Map<String, Map<String, String>>> configurationAttributes = new TreeMap<>(); // get the cluster config for type '*-env' // apply config group overrides
http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java index 4fbc161..8cd2804 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java @@ -357,7 +357,7 @@ public class HeartbeatProcessor extends AbstractService{ List<CommandReport> reports = heartbeat.getReports(); // Cache HostRoleCommand entities because we will need them few times - List<Long> taskIds = new ArrayList<Long>(); + List<Long> taskIds = new ArrayList<>(); for (CommandReport report : reports) { taskIds.add(report.getTaskId()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java index 988e78b..d1e5dbc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HostInfo.java @@ -45,7 +45,7 @@ public class HostInfo { private String macaddress; private long memoryfree; private long memorysize; - private List<DiskInfo> mounts = new ArrayList<DiskInfo>(); + private List<DiskInfo> mounts = new ArrayList<>(); private long memorytotal; private String netmask; private String operatingsystem; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java index 40b2260..47af7c1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java @@ -30,7 +30,7 @@ public class RecoveryReport { * One of DISABLED, RECOVERABLE, UNRECOVERABLE, PARTIALLY_RECOVERABLE */ private String summary = "DISABLED"; - private List<ComponentRecoveryReport> componentReports = new ArrayList<ComponentRecoveryReport>(); + private List<ComponentRecoveryReport> componentReports = new ArrayList<>(); @JsonProperty("summary") http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java index c12ed82..8efefde 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/RegistrationResponse.java @@ -38,7 +38,7 @@ public class RegistrationResponse { * alert definitions it needs to schedule. */ @JsonProperty("alertDefinitionCommands") - private List<AlertDefinitionCommand> alertDefinitionCommands = new ArrayList<AlertDefinitionCommand>(); + private List<AlertDefinitionCommand> alertDefinitionCommands = new ArrayList<>(); /** * exitstatus is a code of error which was rised on server side. http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java index 5dd9e6f..9c17e00 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java @@ -49,10 +49,10 @@ public class StatusCommand extends AgentCommand { private Map<String, Map<String, Map<String, String>>> configurationAttributes; @SerializedName("commandParams") - private Map<String, String> commandParams = new HashMap<String, String>(); + private Map<String, String> commandParams = new HashMap<>(); @SerializedName("hostLevelParams") - private Map<String, String> hostLevelParams = new HashMap<String, String>(); + private Map<String, String> hostLevelParams = new HashMap<>(); @SerializedName("hostname") private String hostname = null; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java index 11e87d0..8faa2a1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/AmbariPerformanceRunnable.java @@ -157,7 +157,7 @@ public class AmbariPerformanceRunnable extends AlertRunnable { SecurityContextHolder.getContext().setAuthentication(authenticationToken); // create the request - Map<Resource.Type, String> mapIds = new HashMap<Resource.Type, String>(); + Map<Resource.Type, String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, cluster.getClusterName()); ClusterController clusterController = ClusterControllerHelper.getClusterController(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java index 7cb679b..503ad92 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/alerts/StaleAlertRunnable.java @@ -134,7 +134,7 @@ public class StaleAlertRunnable extends AlertRunnable { long uptime = rb.getUptime(); int totalStaleAlerts = 0; - Set<String> staleAlertGroupings = new TreeSet<String>(); + Set<String> staleAlertGroupings = new TreeSet<>(); Map<String, Set<String>> staleAlertsByHost = new HashMap<>(); Set<String> hostsWithStaleAlerts = new TreeSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java index 60c0e77..b3da328 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java @@ -38,7 +38,7 @@ public class AmbariCsrfProtectionFilter implements ContainerRequestFilter { private static final JsonSerializer JSON_SERIALIZER = new JsonSerializer(); static { - HashSet<String> methods = new HashSet<String>(); + HashSet<String> methods = new HashSet<>(); methods.add("GET"); methods.add("OPTIONS"); methods.add("HEAD"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java index 3f40ac8..a57effc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariErrorHandler.java @@ -57,7 +57,7 @@ public class AmbariErrorHandler extends ErrorHandler { response.setContentType(MimeTypes.TEXT_PLAIN); - Map<String, Object> errorMap = new LinkedHashMap<String, Object>(); + Map<String, Object> errorMap = new LinkedHashMap<>(); int code = connection.getResponse().getStatus(); errorMap.put("status", code); String message = connection.getResponse().getReason(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java index beb8ea2..40bac90 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/handlers/QueryCreateHandler.java @@ -111,7 +111,7 @@ public class QueryCreateHandler extends BaseManagementHandler { Set<NamedPropertySet> setRequestProps = request.getBody().getNamedPropertySets(); HashMap<Resource.Type, Set<Map<String, Object>>> mapProps = - new HashMap<Resource.Type, Set<Map<String, Object>>>(); + new HashMap<>(); ResourceInstance resource = request.getResource(); Resource.Type type = resource.getResourceDefinition().getType(); @@ -128,13 +128,13 @@ public class QueryCreateHandler extends BaseManagementHandler { for (Map.Entry<String, Object> entry : namedProps.getProperties().entrySet()) { Set<Map<String, Object>> set = (Set<Map<String, Object>>) entry.getValue(); for (Map<String, Object> map : set) { - Map<String, Object> mapResourceProps = new HashMap<String, Object>(map); + Map<String, Object> mapResourceProps = new HashMap<>(map); Resource.Type createType = getCreateType(resource, entry.getKey()); mapResourceProps.put(controller.getSchema(createType). getKeyPropertyId(resource.getResourceDefinition().getType()), keyVal); Set<Map<String, Object>> setCreateProps = mapProps.get(createType); if (setCreateProps == null) { - setCreateProps = new HashSet<Map<String, Object>>(); + setCreateProps = new HashSet<>(); mapProps.put(createType, setCreateProps); } setCreateProps.add(mapResourceProps); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java index f767454..afea2d3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryLexer.java @@ -64,12 +64,12 @@ public class QueryLexer { * Map of token type to list of valid handlers for next token. */ private static final Map<Token.TYPE, List<TokenHandler>> TOKEN_HANDLERS = - new HashMap<Token.TYPE, List<TokenHandler>>(); + new HashMap<>(); /** * Static set of property names to ignore. */ - private static final Set<String> SET_IGNORE = new HashSet<String>(); + private static final Set<String> SET_IGNORE = new HashSet<>(); /** @@ -78,7 +78,7 @@ public class QueryLexer { */ public QueryLexer() { //todo: refactor handler registration - List<TokenHandler> listHandlers = new ArrayList<TokenHandler>(); + List<TokenHandler> listHandlers = new ArrayList<>(); listHandlers.add(new LogicalUnaryOperatorTokenHandler()); listHandlers.add(new OpenBracketTokenHandler()); listHandlers.add(new PropertyOperandTokenHandler()); @@ -87,26 +87,26 @@ public class QueryLexer { TOKEN_HANDLERS.put(Token.TYPE.LOGICAL_OPERATOR, listHandlers); TOKEN_HANDLERS.put(Token.TYPE.LOGICAL_UNARY_OPERATOR, listHandlers); - listHandlers= new ArrayList<TokenHandler>(); + listHandlers= new ArrayList<>(); listHandlers.add(new RelationalOperatorTokenHandler()); listHandlers.add(new RelationalOperatorFuncTokenHandler()); TOKEN_HANDLERS.put(Token.TYPE.PROPERTY_OPERAND, listHandlers); - listHandlers = new ArrayList<TokenHandler>(); + listHandlers = new ArrayList<>(); listHandlers.add(new ValueOperandTokenHandler()); TOKEN_HANDLERS.put(Token.TYPE.RELATIONAL_OPERATOR, listHandlers); - listHandlers = new ArrayList<TokenHandler>(); + listHandlers = new ArrayList<>(); listHandlers.add(new CloseBracketTokenHandler()); listHandlers.add(new ComplexValueOperandTokenHandler()); TOKEN_HANDLERS.put(Token.TYPE.RELATIONAL_OPERATOR_FUNC, listHandlers); - listHandlers = new ArrayList<TokenHandler>(); + listHandlers = new ArrayList<>(); listHandlers.add(new CloseBracketTokenHandler()); listHandlers.add(new LogicalOperatorTokenHandler()); TOKEN_HANDLERS.put(Token.TYPE.BRACKET_CLOSE, listHandlers); - listHandlers = new ArrayList<TokenHandler>(listHandlers); + listHandlers = new ArrayList<>(listHandlers); // complex value operands can span multiple tokens listHandlers.add(0, new ComplexValueOperandTokenHandler()); TOKEN_HANDLERS.put(Token.TYPE.VALUE_OPERAND, listHandlers); @@ -170,7 +170,7 @@ public class QueryLexer { private List<String> parseStringTokens(String exp) { Pattern pattern = generatePattern(); Matcher matcher = pattern.matcher(exp); - List<String> listStrTokens = new ArrayList<String>(); + List<String> listStrTokens = new ArrayList<>(); int pos = 0; while (matcher.find()) { // while there's a delimiter in the string @@ -238,7 +238,7 @@ public class QueryLexer { /** * List of tokens generated by the scan */ - private List<Token> m_listTokens = new ArrayList<Token>(); + private List<Token> m_listTokens = new ArrayList<>(); /** * If non-null, ignore all tokens up to and including this token type. @@ -248,7 +248,7 @@ public class QueryLexer { /** * Property names which are to be ignored. */ - private Set<String> m_propertiesToIgnore = new HashSet<String>(); + private Set<String> m_propertiesToIgnore = new HashSet<>(); /** * Bracket score. This score is the difference between the number of @@ -264,7 +264,7 @@ public class QueryLexer { * tokens and then in subsequent invocations combine/alter/remove/etc * these tokens prior to adding them to the context tokens. */ - private Deque<Token> m_intermediateTokens = new ArrayDeque<Token>(); + private Deque<Token> m_intermediateTokens = new ArrayDeque<>(); /** http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java index 7386813..14cf398 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java @@ -52,7 +52,7 @@ public class QueryParser { * Map of token type to token handlers. */ private static final Map<Token.TYPE, TokenHandler> TOKEN_HANDLERS = - new HashMap<Token.TYPE, TokenHandler>(); + new HashMap<>(); /** * Constructor. @@ -152,7 +152,7 @@ public class QueryParser { */ private List<Expression> mergeExpressions(List<Expression> listExpressions, int precedenceLevel) { if (listExpressions.size() > 1) { - Stack<Expression> stack = new Stack<Expression>(); + Stack<Expression> stack = new Stack<>(); stack.push(listExpressions.remove(0)); while (! listExpressions.isEmpty()) { @@ -161,7 +161,7 @@ public class QueryParser { Expression right = listExpressions.remove(0); stack.addAll(exp.merge(left, right, precedenceLevel)); } - return mergeExpressions(new ArrayList<Expression>(stack), precedenceLevel - 1); + return mergeExpressions(new ArrayList<>(stack), precedenceLevel - 1); } return listExpressions; } @@ -193,7 +193,7 @@ public class QueryParser { /** * The list of expressions which are generated from the tokens. */ - private List<Expression> m_listExpressions = new ArrayList<Expression>(); + private List<Expression> m_listExpressions = new ArrayList<>(); /** * Highest precedence level in expression. http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java index db4220e..2c647aa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/AbstractExpression.java @@ -92,7 +92,7 @@ public abstract class AbstractExpression<T> implements Expression<T> { * @return a list containing the un-merged left expression, this and right expression */ protected List<Expression> defaultMerge(Expression left, Expression right) { - List<Expression> listExpressions = new ArrayList<Expression>(); + List<Expression> listExpressions = new ArrayList<>(); if (left != null) { listExpressions.add(left); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java index 2253570..faadd00 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/expressions/NotLogicalExpression.java @@ -43,7 +43,7 @@ public class NotLogicalExpression extends LogicalExpression { @Override public List<Expression> merge(Expression left, Expression right, int precedence) { if (getOperator().getPrecedence() == precedence && getRightOperand() == null) { - List<Expression> listExpressions = new ArrayList<Expression>(); + List<Expression> listExpressions = new ArrayList<>(); if (left != null) { listExpressions.add(left); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java index ddd9e0d..688e2d9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/EqualsOperator.java @@ -40,7 +40,7 @@ public class EqualsOperator extends AbstractOperator implements RelationalOperat @Override public Predicate toPredicate(String prop, String val) { - return new EqualsPredicate<String>(prop, val); + return new EqualsPredicate<>(prop, val); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java index 175a255..c7ea1ae 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterEqualsOperator.java @@ -40,7 +40,7 @@ public class GreaterEqualsOperator extends AbstractOperator implements Relationa @Override public Predicate toPredicate(String prop, String val) { - return new GreaterEqualsPredicate<String>(prop, val); + return new GreaterEqualsPredicate<>(prop, val); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java index 832507c..05cb695 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/GreaterOperator.java @@ -40,7 +40,7 @@ public class GreaterOperator extends AbstractOperator implements RelationalOpera @Override public Predicate toPredicate(String prop, String val) { - return new GreaterPredicate<String>(prop, val); + return new GreaterPredicate<>(prop, val); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java index b3f7ef6..6b56a59 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java @@ -51,7 +51,7 @@ public class InOperator extends AbstractOperator implements RelationalOperator { } String[] tokens = val.split(","); - List<EqualsPredicate> listPredicates = new ArrayList<EqualsPredicate>(); + List<EqualsPredicate> listPredicates = new ArrayList<>(); for (String token : tokens) { listPredicates.add(new EqualsPredicate<>(prop, token.trim())); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java index bd6e568..cffe382 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessEqualsOperator.java @@ -40,7 +40,7 @@ public class LessEqualsOperator extends AbstractOperator implements RelationalOp @Override public Predicate toPredicate(String prop, String val) { - return new LessEqualsPredicate<String>(prop, val); + return new LessEqualsPredicate<>(prop, val); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java index 8cf378e..374e31c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/LessOperator.java @@ -40,7 +40,7 @@ public class LessOperator extends AbstractOperator implements RelationalOperator @Override public Predicate toPredicate(String prop, String val) { - return new LessPredicate<String>(prop, val); + return new LessPredicate<>(prop, val); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java index d78a8e0..0171494 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/NotEqualsOperator.java @@ -41,7 +41,7 @@ public class NotEqualsOperator extends AbstractOperator implements RelationalOpe @Override public Predicate toPredicate(String prop, String val) { - return new NotPredicate(new EqualsPredicate<String>(prop, val)); + return new NotPredicate(new EqualsPredicate<>(prop, val)); } @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java index e952ffe..2d1a8ce 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ExtendedResourcePredicateVisitor.java @@ -72,7 +72,7 @@ public class ExtendedResourcePredicateVisitor implements PredicateVisitor { @Override public void acceptArrayPredicate(ArrayPredicate arrayPredicate) { - List<Predicate> predicateList = new LinkedList<Predicate>(); + List<Predicate> predicateList = new LinkedList<>(); Predicate[] predicates = arrayPredicate.getPredicates(); if (predicates.length > 0) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java index bed0e5a..bcc5acc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaPredicateVisitor.java @@ -79,7 +79,7 @@ public abstract class JpaPredicateVisitor<T> implements PredicateVisitor { * closed, the chain is completed and added to the prior chain's list. */ private ArrayDeque<List<javax.persistence.criteria.Predicate>> m_queue = - new ArrayDeque<List<javax.persistence.criteria.Predicate>>(); + new ArrayDeque<>(); /** * Constructor. @@ -225,7 +225,7 @@ public abstract class JpaPredicateVisitor<T> implements PredicateVisitor { } // create a new list for all of the predicates in this chain - List<javax.persistence.criteria.Predicate> predicateList = new ArrayList<javax.persistence.criteria.Predicate>(); + List<javax.persistence.criteria.Predicate> predicateList = new ArrayList<>(); m_queue.add(predicateList); // visit every child predicate so it can be added to the list http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java index 5161e83..6d76945 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java @@ -74,7 +74,7 @@ public class JpaSortBuilder<T> { CriteriaBuilder builder = visitor.getCriteriaBuilder(); List<SortRequestProperty> sortProperties = sortRequest.getProperties(); - List<Order> sortOrders = new ArrayList<Order>(sortProperties.size()); + List<Order> sortOrders = new ArrayList<>(sortProperties.size()); for (SortRequestProperty sort : sortProperties) { String propertyId = sort.getPropertyId(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java index 5b97e84..c5fddac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/ProcessingPredicateVisitor.java @@ -72,12 +72,12 @@ public class ProcessingPredicateVisitor implements PredicateVisitor { /** * The set of sub-resource categories. */ - private final Set<String> subResourceCategories = new HashSet<String>(); + private final Set<String> subResourceCategories = new HashSet<>(); /** * The set of sub-resource properties. */ - private final Set<String> subResourceProperties = new HashSet<String>(); + private final Set<String> subResourceProperties = new HashSet<>(); // ----- Constructors ---------------------------------------------------- @@ -115,7 +115,7 @@ public class ProcessingPredicateVisitor implements PredicateVisitor { @Override public void acceptArrayPredicate(ArrayPredicate arrayPredicate) { - List<Predicate> predicateList = new LinkedList<Predicate>(); + List<Predicate> predicateList = new LinkedList<>(); Predicate[] predicates = arrayPredicate.getPredicates(); if (predicates.length > 0) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java index eb3bd76..144ad92 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java @@ -81,38 +81,38 @@ public class QueryImpl implements Query, ResourceInstance { /** * Properties of the query which make up the select portion of the query. */ - private final Set<String> requestedProperties = new HashSet<String>(); + private final Set<String> requestedProperties = new HashSet<>(); /** * Map that associates categories with temporal data. */ - private final Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>(); + private final Map<String, TemporalInfo> temporalInfoMap = new HashMap<>(); /** * Map of primary and foreign key values. */ - private final Map<Resource.Type, String> keyValueMap = new HashMap<Resource.Type, String>(); + private final Map<Resource.Type, String> keyValueMap = new HashMap<>(); /** * Map of properties from the request. */ - private final Map<String, String> requestInfoProperties = new HashMap<String, String>(); + private final Map<String, String> requestInfoProperties = new HashMap<>(); /** * Set of query results. */ - Map<Resource, QueryResult> queryResults = new LinkedHashMap<Resource, QueryResult>(); + Map<Resource, QueryResult> queryResults = new LinkedHashMap<>(); /** * Set of populated query results */ - Map<Resource, QueryResult> populatedQueryResults = new LinkedHashMap<Resource, QueryResult>(); + Map<Resource, QueryResult> populatedQueryResults = new LinkedHashMap<>(); /** * Sub-resources of the resource which is being operated on. * Should only be added via {@link #addSubResource(String, QueryImpl)} */ - private final Map<String, QueryImpl> requestedSubResources = new HashMap<String, QueryImpl>(); + private final Map<String, QueryImpl> requestedSubResources = new HashMap<>(); /** * Sub-resource instances of this resource. @@ -143,7 +143,7 @@ public class QueryImpl implements Query, ResourceInstance { /** * The sub resource properties referenced in the user predicate. */ - private final Set<String> subResourcePredicateProperties = new HashSet<String>(); + private final Set<String> subResourcePredicateProperties = new HashSet<>(); /** * Associated renderer. The default renderer is used unless @@ -276,7 +276,7 @@ public class QueryImpl implements Query, ResourceInstance { @Override public Map<Resource.Type, String> getKeyValueMap() { - return new HashMap<Resource.Type, String>((keyValueMap)); + return new HashMap<>((keyValueMap)); } @Override @@ -341,7 +341,7 @@ public class QueryImpl implements Query, ResourceInstance { */ protected Map<String, QueryImpl> ensureSubResources() { if (availableSubResources == null) { - availableSubResources = new HashMap<String, QueryImpl>(); + availableSubResources = new HashMap<>(); Set<SubResourceDefinition> setSubResourceDefs = getResourceDefinition().getSubResourceDefinitions(); @@ -392,8 +392,8 @@ public class QueryImpl implements Query, ResourceInstance { // use linked hash sets so that we maintain insertion and traversal order // in the event that the resource provider already gave us a sorted set // back - Set<Resource> resourceSet = new LinkedHashSet<Resource>(); - Set<Resource> providerResourceSet = new LinkedHashSet<Resource>(); + Set<Resource> resourceSet = new LinkedHashSet<>(); + Set<Resource> providerResourceSet = new LinkedHashSet<>(); QueryResponse queryResponse = doQuery(resourceType, request, queryPredicate, true); @@ -444,7 +444,7 @@ public class QueryImpl implements Query, ResourceInstance { queryResponse.getTotalResourceCount()); PageResponse pageResponse = clusterController.getPage(resourceType, newResponse, request, queryPredicate, pageRequest, sortRequest); // build a new set - Set<Resource> newResourceSet = new LinkedHashSet<Resource>(); + Set<Resource> newResourceSet = new LinkedHashSet<>(); for (Resource r : pageResponse.getIterable()) { newResourceSet.add(r); } @@ -468,14 +468,14 @@ public class QueryImpl implements Query, ResourceInstance { QueryImpl subResource = entry.getValue(); Resource.Type resourceType = subResource.getResourceDefinition().getType(); Request request = subResource.createRequest(); - Set<Resource> providerResourceSet = new HashSet<Resource>(); + Set<Resource> providerResourceSet = new HashSet<>(); for (QueryResult queryResult : populatedQueryResults.values()) { for (Resource resource : queryResult.getQueryResponse().getResources()) { Map<Resource.Type, String> map = getKeyValueMap(resource, queryResult.getKeyValueMap()); Predicate queryPredicate = subResource.createPredicate(map, subResource.processedPredicate); - Set<Resource> resourceSet = new LinkedHashSet<Resource>(); + Set<Resource> resourceSet = new LinkedHashSet<>(); try { Set<Resource> queryResources = @@ -611,7 +611,7 @@ public class QueryImpl implements Query, ResourceInstance { throws SystemException, UnsupportedPropertyException, NoSuchParentResourceException, NoSuchResourceException { Map<Resource, Set<Map<String, Object>>> resourcePropertyMaps = - new HashMap<Resource, Set<Map<String, Object>>>(); + new HashMap<>(); Map<String, String> categoryPropertyIdMap = getPropertyIdsForCategory(propertyIds, category); @@ -629,7 +629,7 @@ public class QueryImpl implements Query, ResourceInstance { for (Resource resource : iterResource) { // get the resource properties - Map<String, Object> resourcePropertyMap = new HashMap<String, Object>(); + Map<String, Object> resourcePropertyMap = new HashMap<>(); for (Map.Entry<String, String> categoryPropertyIdEntry : categoryPropertyIdMap.entrySet()) { Object value = resource.getPropertyValue(categoryPropertyIdEntry.getValue()); if (value != null) { @@ -637,7 +637,7 @@ public class QueryImpl implements Query, ResourceInstance { } } - Set<Map<String, Object>> propertyMaps = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertyMaps = new HashSet<>(); // For each sub category get the property maps for the sub resources for (Map.Entry<String, QueryImpl> entry : requestedSubResources.entrySet()) { @@ -648,7 +648,7 @@ public class QueryImpl implements Query, ResourceInstance { Map<Resource, Set<Map<String, Object>>> subResourcePropertyMaps = subResource.getJoinedResourceProperties(propertyIds, resource, subResourceCategory); - Set<Map<String, Object>> combinedSubResourcePropertyMaps = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> combinedSubResourcePropertyMaps = new HashSet<>(); for (Set<Map<String, Object>> maps : subResourcePropertyMaps.values()) { combinedSubResourcePropertyMaps.addAll(maps); } @@ -678,8 +678,8 @@ public class QueryImpl implements Query, ResourceInstance { ResourceDefinition rootDefinition = resourceDefinition; QueryInfo rootQueryInfo = new QueryInfo(rootDefinition, requestedProperties); - TreeNode<QueryInfo> rootNode = new TreeNodeImpl<QueryInfo>( - null, rootQueryInfo, rootDefinition.getType().name()); + TreeNode<QueryInfo> rootNode = new TreeNodeImpl<>( + null, rootQueryInfo, rootDefinition.getType().name()); TreeNode<QueryInfo> requestedPropertyTree = buildQueryPropertyTree(this, rootNode); @@ -745,7 +745,7 @@ public class QueryImpl implements Query, ResourceInstance { // Map the given set of property ids to corresponding property ids in the // given sub-resource category. private Map<String, String> getPropertyIdsForCategory(Set<String> propertyIds, String category) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); for (String propertyId : propertyIds) { if (category == null || propertyId.startsWith(category)) { @@ -758,7 +758,7 @@ public class QueryImpl implements Query, ResourceInstance { // Join two sets of property maps into one. private static Set<Map<String, Object>> joinPropertyMaps(Set<Map<String, Object>> propertyMaps1, Set<Map<String, Object>> propertyMaps2) { - Set<Map<String, Object>> propertyMaps = new HashSet<Map<String, Object>>(); + Set<Map<String, Object>> propertyMaps = new HashSet<>(); if (propertyMaps1.isEmpty()) { return propertyMaps2; @@ -769,7 +769,7 @@ public class QueryImpl implements Query, ResourceInstance { for (Map<String, Object> map1 : propertyMaps1) { for (Map<String, Object> map2 : propertyMaps2) { - Map<String, Object> joinedMap = new HashMap<String, Object>(map1); + Map<String, Object> joinedMap = new HashMap<>(map1); joinedMap.putAll(map2); propertyMaps.add(joinedMap); } @@ -902,12 +902,12 @@ public class QueryImpl implements Query, ResourceInstance { Resource.Type resourceType = getResourceDefinition().getType(); Schema schema = clusterController.getSchema(resourceType); - Set<Predicate> setPredicates = new HashSet<Predicate>(); + Set<Predicate> setPredicates = new HashSet<>(); for (Map.Entry<Resource.Type, String> entry : mapResourceIds.entrySet()) { if (entry.getValue() != null) { String keyPropertyId = schema.getKeyPropertyId(entry.getKey()); if (keyPropertyId != null) { - setPredicates.add(new EqualsPredicate<String>(keyPropertyId, entry.getValue())); + setPredicates.add(new EqualsPredicate<>(keyPropertyId, entry.getValue())); } } } @@ -985,7 +985,7 @@ public class QueryImpl implements Query, ResourceInstance { private Request createRequest() { // Initiate this request's requestInfoProperties with the ones set from the original request - Map<String, String> requestInfoProperties = new HashMap<String, String>(this.requestInfoProperties); + Map<String, String> requestInfoProperties = new HashMap<>(this.requestInfoProperties); if (pageRequest != null) { requestInfoProperties.put(BaseRequest.PAGE_SIZE_PROPERTY_KEY, @@ -1002,10 +1002,10 @@ public class QueryImpl implements Query, ResourceInstance { requestInfoProperties, null, pageRequest, sortRequest); } - Map<String, TemporalInfo> mapTemporalInfo = new HashMap<String, TemporalInfo>(); + Map<String, TemporalInfo> mapTemporalInfo = new HashMap<>(); TemporalInfo globalTemporalInfo = temporalInfoMap.get(null); - Set<String> setProperties = new HashSet<String>(); + Set<String> setProperties = new HashSet<>(); setProperties.addAll(requestedProperties); for (String propertyId : setProperties) { TemporalInfo temporalInfo = temporalInfoMap.get(propertyId); @@ -1024,7 +1024,7 @@ public class QueryImpl implements Query, ResourceInstance { // Get a key value map based on the given resource and an existing key value map private Map<Resource.Type, String> getKeyValueMap(Resource resource, Map<Resource.Type, String> keyValueMap) { - Map<Resource.Type, String> resourceKeyValueMap = new HashMap<Resource.Type, String>(keyValueMap.size()); + Map<Resource.Type, String> resourceKeyValueMap = new HashMap<>(keyValueMap.size()); for (Map.Entry<Resource.Type, String> resourceIdEntry : keyValueMap.entrySet()) { Resource.Type type = resourceIdEntry.getKey(); String value = resourceIdEntry.getValue(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java index fb48077..d75b0c4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryInfo.java @@ -48,7 +48,7 @@ public class QueryInfo { */ public QueryInfo(ResourceDefinition resource, Set<String> properties) { m_resource = resource; - m_properties = new HashSet<String>(properties); + m_properties = new HashSet<>(properties); } // ----- QueryInfo --------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java index 15a3396..ed66160 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/SubResourcePredicateVisitor.java @@ -87,7 +87,7 @@ public class SubResourcePredicateVisitor implements PredicateVisitor { @Override public void acceptArrayPredicate(ArrayPredicate arrayPredicate) { - List<Predicate> predicateList = new LinkedList<Predicate>(); + List<Predicate> predicateList = new LinkedList<>(); Predicate[] predicates = arrayPredicate.getPredicates(); if (predicates.length > 0) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java index b5c08f9..71f82ad 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryGroupedRenderer.java @@ -125,7 +125,7 @@ public class AlertSummaryGroupedRenderer extends AlertSummaryRenderer { @Override public Result finalizeResult(Result queryResult) { TreeNode<Resource> resultTree = queryResult.getResultTree(); - Map<String, AlertDefinitionSummary> summaries = new HashMap<String, AlertDefinitionSummary>(); + Map<String, AlertDefinitionSummary> summaries = new HashMap<>(); // iterate over all returned flattened alerts and build the summary info for (TreeNode<Resource> node : resultTree.getChildren()) { @@ -204,8 +204,8 @@ public class AlertSummaryGroupedRenderer extends AlertSummaryRenderer { } Set<Entry<String, AlertDefinitionSummary>> entrySet = summaries.entrySet(); - List<AlertDefinitionSummary> groupedResources = new ArrayList<AlertDefinitionSummary>( - entrySet.size()); + List<AlertDefinitionSummary> groupedResources = new ArrayList<>( + entrySet.size()); // iterate over all summary groups, adding them to the final list for (Entry<String, AlertDefinitionSummary> entry : entrySet) { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryRenderer.java index c6e6c7e..6070891 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/AlertSummaryRenderer.java @@ -87,8 +87,8 @@ public class AlertSummaryRenderer extends BaseRenderer implements Renderer { TreeNode<QueryInfo> queryTree, boolean isCollection) { QueryInfo queryInfo = queryTree.getObject(); - TreeNode<Set<String>> resultTree = new TreeNodeImpl<Set<String>>( - null, queryInfo.getProperties(), queryTree.getName()); + TreeNode<Set<String>> resultTree = new TreeNodeImpl<>( + null, queryInfo.getProperties(), queryTree.getName()); copyPropertiesToResult(queryTree, resultTree); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java index 632249a..ddbfcb4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/BaseRenderer.java @@ -131,7 +131,7 @@ public abstract class BaseRenderer implements Renderer { ResourceDefinition resource = queryInfo.getResource(); Set<SubResourceDefinition> subResources = resource.getSubResourceDefinitions(); for (SubResourceDefinition subResource : subResources) { - Set<String> resourceProperties = new HashSet<String>(); + Set<String> resourceProperties = new HashSet<>(); populateSubResourceDefaults(subResource, resourceProperties); propertyTree.addChild(resourceProperties, subResource.getType().name()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java index 5e19a6c..31cb061 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java @@ -94,9 +94,9 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { public TreeNode<Set<String>> finalizeProperties( TreeNode<QueryInfo> queryProperties, boolean isCollection) { - Set<String> properties = new HashSet<String>(queryProperties.getObject().getProperties()); - TreeNode<Set<String>> resultTree = new TreeNodeImpl<Set<String>>( - null, properties, queryProperties.getName()); + Set<String> properties = new HashSet<>(queryProperties.getObject().getProperties()); + TreeNode<Set<String>> resultTree = new TreeNodeImpl<>( + null, properties, queryProperties.getName()); copyPropertiesToResult(queryProperties, resultTree); @@ -153,8 +153,8 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { for (TreeNode<Resource> node : resultTree.getChildren()) { Resource blueprintResource = createBlueprintResource(node); - blueprintResultTree.addChild(new TreeNodeImpl<Resource>( - blueprintResultTree, blueprintResource, node.getName())); + blueprintResultTree.addChild(new TreeNodeImpl<>( + blueprintResultTree, blueprintResource, node.getName())); } return result; } @@ -268,11 +268,11 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { LOG.info("ClusterBlueprintRenderer: getSettings()"); //Initialize collections to create appropriate json structure - Collection<Map<String, Object>> blueprintSetting = new ArrayList<Map<String, Object>>(); + Collection<Map<String, Object>> blueprintSetting = new ArrayList<>(); - Set<Map<String, String>> recoverySettingValue = new HashSet<Map<String, String>>(); - Set<Map<String, String>> serviceSettingValue = new HashSet<Map<String, String>>(); - Set<Map<String, String>> componentSettingValue = new HashSet<Map<String, String>>(); + Set<Map<String, String>> recoverySettingValue = new HashSet<>(); + Set<Map<String, String>> serviceSettingValue = new HashSet<>(); + Set<Map<String, String>> componentSettingValue = new HashSet<>(); HashMap<String, String> property = new HashMap<>(); HashMap<String, String> componentProperty = new HashMap<>(); @@ -366,7 +366,7 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { if (propertyMap != null) { Map<String, Object> artifactData = propertyMap.get(ArtifactResourceProvider.ARTIFACT_DATA_PROPERTY); Map<String, Object> artifactDataProperties = propertyMap.get(ArtifactResourceProvider.ARTIFACT_DATA_PROPERTY + "/properties"); - HashMap<String, Object> data = new HashMap<String, Object>(); + HashMap<String, Object> data = new HashMap<>(); if (artifactData != null) { data.putAll(artifactData); @@ -389,14 +389,14 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { */ private List<Map<String, Map<String, Map<String, ?>>>> processConfigurations(ClusterTopology topology) { - List<Map<String, Map<String, Map<String, ?>>>> configList = new ArrayList<Map<String, Map<String, Map<String, ?>>>>(); + List<Map<String, Map<String, Map<String, ?>>>> configList = new ArrayList<>(); Configuration configuration = topology.getConfiguration(); - Collection<String> allTypes = new HashSet<String>(); + Collection<String> allTypes = new HashSet<>(); allTypes.addAll(configuration.getFullProperties().keySet()); allTypes.addAll(configuration.getFullAttributes().keySet()); for (String type : allTypes) { - Map<String, Map<String, ?>> typeMap = new HashMap<String, Map<String, ?>>(); + Map<String, Map<String, ?>> typeMap = new HashMap<>(); typeMap.put("properties", configuration.getFullProperties().get(type)); if (! configuration.getFullAttributes().isEmpty()) { typeMap.put("properties_attributes", configuration.getFullAttributes().get(type)); @@ -415,9 +415,9 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { * @return list of host group property maps, one element for each host group */ private List<Map<String, Object>> formatGroupsAsList(ClusterTopology topology) { - List<Map<String, Object>> listHostGroups = new ArrayList<Map<String, Object>>(); + List<Map<String, Object>> listHostGroups = new ArrayList<>(); for (HostGroupInfo group : topology.getHostGroupInfo().values()) { - Map<String, Object> mapGroupProperties = new HashMap<String, Object>(); + Map<String, Object> mapGroupProperties = new HashMap<>(); listHostGroups.add(mapGroupProperties); String name = group.getHostGroupName(); @@ -426,7 +426,7 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { mapGroupProperties.put("components", processHostGroupComponents(topology.getBlueprint().getHostGroup(name))); Configuration configuration = topology.getHostGroupInfo().get(name).getConfiguration(); - List<Map<String, Map<String, String>>> configList = new ArrayList<Map<String, Map<String, String>>>(); + List<Map<String, Map<String, String>>> configList = new ArrayList<>(); for (Map.Entry<String, Map<String, String>> typeEntry : configuration.getProperties().entrySet()) { Map<String, Map<String, String>> propertyMap = Collections.singletonMap( typeEntry.getKey(), typeEntry.getValue()); @@ -447,9 +447,9 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer { * @return list of component names for the host */ private List<Map<String, String>> processHostGroupComponents(HostGroup group) { - List<Map<String, String>> listHostGroupComponents = new ArrayList<Map<String, String>>(); + List<Map<String, String>> listHostGroupComponents = new ArrayList<>(); for (Component component : group.getComponents()) { - Map<String, String> mapComponentProperties = new HashMap<String, String>(); + Map<String, String> mapComponentProperties = new HashMap<>(); listHostGroupComponents.add(mapComponentProperties); mapComponentProperties.put("name", component.getName()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java index 801c28f..5b5690e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/DefaultRenderer.java @@ -41,8 +41,8 @@ public class DefaultRenderer extends BaseRenderer implements Renderer { TreeNode<QueryInfo> queryTree, boolean isCollection) { QueryInfo queryInfo = queryTree.getObject(); - TreeNode<Set<String>> resultTree = new TreeNodeImpl<Set<String>>( - null, queryInfo.getProperties(), queryTree.getName()); + TreeNode<Set<String>> resultTree = new TreeNodeImpl<>( + null, queryInfo.getProperties(), queryTree.getName()); copyPropertiesToResult(queryTree, resultTree); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java index 98452e5..ec5185b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/MinimalRenderer.java @@ -69,7 +69,7 @@ public class MinimalRenderer extends BaseRenderer implements Renderer { * Map of requested properties. */ private Map<Resource.Type, Set<String>> m_originalProperties = - new HashMap<Resource.Type, Set<String>>(); + new HashMap<>(); // ----- Renderer ---------------------------------------------------------- @@ -78,8 +78,8 @@ public class MinimalRenderer extends BaseRenderer implements Renderer { TreeNode<QueryInfo> queryTree, boolean isCollection) { QueryInfo queryInfo = queryTree.getObject(); - TreeNode<Set<String>> resultTree = new TreeNodeImpl<Set<String>>( - null, queryInfo.getProperties(), queryTree.getName()); + TreeNode<Set<String>> resultTree = new TreeNodeImpl<>( + null, queryInfo.getProperties(), queryTree.getName()); copyPropertiesToResult(queryTree, resultTree); @@ -123,7 +123,7 @@ public class MinimalRenderer extends BaseRenderer implements Renderer { Resource.Type type = queryInfo.getResource().getType(); Set<String> properties = m_originalProperties.get(type); if (properties == null) { - properties = new HashSet<String>(); + properties = new HashSet<>(); m_originalProperties.put(type, properties); } properties.addAll(queryInfo.getProperties()); @@ -203,7 +203,7 @@ public class MinimalRenderer extends BaseRenderer implements Renderer { * @return set of pk's for a type */ private Set<String> getPrimaryKeys(Resource.Type type) { - Set<String> primaryKeys = new HashSet<String>(); + Set<String> primaryKeys = new HashSet<>(); if (type == Resource.Type.Configuration) { primaryKeys.add("type"); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java index 5d1a6a0..99bcd03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java @@ -54,12 +54,12 @@ public abstract class BaseResourceDefinition implements ResourceDefinition { /** * The sub-resource type definitions. */ - private final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<SubResourceDefinition>(); + private final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<>(); /** * A map of directives for the different request types, each entry is expected to be modifiable by sub resources. */ - private final Map<DirectiveType, Collection<String>> directives = new HashMap<DirectiveType, Collection<String>>(); + private final Map<DirectiveType, Collection<String>> directives = new HashMap<>(); /** * Constructor. @@ -116,7 +116,7 @@ public abstract class BaseResourceDefinition implements ResourceDefinition { @Override public List<PostProcessor> getPostProcessors() { - List<PostProcessor> listProcessors = new ArrayList<PostProcessor>(); + List<PostProcessor> listProcessors = new ArrayList<>(); listProcessors.add(new BaseHrefPostProcessor()); return listProcessors; } @@ -242,7 +242,7 @@ public abstract class BaseResourceDefinition implements ResourceDefinition { * @param directives the map of directives from which to copy */ private void initializeDirectives(DirectiveType type, Map<DirectiveType, ? extends Collection<String>> directives) { - HashSet<String> requestDirectives = new HashSet<String>(); + HashSet<String> requestDirectives = new HashSet<>(); if ((directives != null) && directives.get(type) != null) { requestDirectives.addAll(directives.get(type)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java index 1a3aa01..e181347 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ClusterResourceDefinition.java @@ -60,7 +60,7 @@ public class ClusterResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.Service)); setChildren.add(new SubResourceDefinition(Resource.Type.Host)); setChildren.add(new SubResourceDefinition(Resource.Type.Configuration)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java index f3d26be..2bc4d7f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ComponentStackVersionResourceDefinition.java @@ -42,7 +42,7 @@ public class ComponentStackVersionResourceDefinition extends BaseResourceDefinit @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - final Set<SubResourceDefinition> subResourceDefintions = new HashSet<SubResourceDefinition>(); + final Set<SubResourceDefinition> subResourceDefintions = new HashSet<>(); subResourceDefintions.add(new SubResourceDefinition(Resource.Type.RepositoryVersion)); return subResourceDefintions; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java index f03f4f7..9c2c58d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionLinkResourceDefinition.java @@ -51,7 +51,7 @@ public class ExtensionLinkResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); return setChildren; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java index bad78b9..e4e356a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionResourceDefinition.java @@ -51,7 +51,7 @@ public class ExtensionResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.ExtensionVersion)); return setChildren; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionVersionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionVersionResourceDefinition.java index 824640a..1889d36 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionVersionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ExtensionVersionResourceDefinition.java @@ -47,7 +47,7 @@ public class ExtensionVersionResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> children = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> children = new HashSet<>(); return children; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java index b7638ff..756986e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/FeedResourceDefinition.java @@ -47,7 +47,7 @@ public class FeedResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.DRInstance)); return setChildren; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java index 57e5e20..481e86e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/GroupResourceDefinition.java @@ -42,7 +42,7 @@ public class GroupResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<SubResourceDefinition>(); + final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<>(); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.Member)); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.GroupPrivilege)); return subResourceDefinitions; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java index e028d31..add2c45 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/HostComponentResourceDefinition.java @@ -56,7 +56,7 @@ public class HostComponentResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setSubResources = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setSubResources = new HashSet<>(); setSubResources.add(new SubResourceDefinition(Resource.Type.Component, Collections.singleton(Resource.Type.Service), false)); @@ -68,7 +68,7 @@ public class HostComponentResourceDefinition extends BaseResourceDefinition { @Override public List<PostProcessor> getPostProcessors() { - List<PostProcessor> listProcessors = new ArrayList<PostProcessor>(); + List<PostProcessor> listProcessors = new ArrayList<>(); listProcessors.add(new HostComponentHrefProcessor()); listProcessors.add(new HostComponentHostProcessor()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/JobResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/JobResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/JobResourceDefinition.java index d9b69d0..1b326d0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/JobResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/JobResourceDefinition.java @@ -47,7 +47,7 @@ public class JobResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.TaskAttempt)); return setChildren; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java index e111d96..ed33aa0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/PermissionResourceDefinition.java @@ -53,7 +53,7 @@ public class PermissionResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> subResourceDefinitions = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> subResourceDefinitions = new HashSet<>(); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.RoleAuthorization)); return subResourceDefinitions; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java index 5e7f0da..7f7da80 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java @@ -49,7 +49,7 @@ public class ResourceInstanceFactoryImpl implements ResourceInstanceFactory { * Map of external resource definitions (added through views). */ private final static Map<Resource.Type, ResourceDefinition> resourceDefinitions = - new HashMap<Resource.Type, ResourceDefinition>(); + new HashMap<>(); @Override http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java index 297e7d7..f5aff73 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceHostComponentResourceDefinition.java @@ -51,7 +51,7 @@ public class RootServiceHostComponentResourceDefinition extends @Override public List<PostProcessor> getPostProcessors() { - List<PostProcessor> listProcessors = new ArrayList<PostProcessor>(); + List<PostProcessor> listProcessors = new ArrayList<>(); listProcessors.add(new RootServiceHostComponentHrefProcessor()); return listProcessors; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceResourceDefinition.java index b323d9d..cc73466 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RootServiceResourceDefinition.java @@ -47,7 +47,7 @@ public class RootServiceResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.RootServiceComponent)); return setChildren; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java index cebe83b..0bf0d1e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ServiceResourceDefinition.java @@ -48,7 +48,7 @@ public class ServiceResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> subs = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> subs = new HashSet<>(); subs.add(new SubResourceDefinition(Resource.Type.Component)); subs.add(new SubResourceDefinition(Resource.Type.Alert)); //todo: dynamic sub-resource definition http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java index 7cf5926..bb9375b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackConfigurationResourceDefinition.java @@ -47,7 +47,7 @@ public class StackConfigurationResourceDefinition extends BaseResourceDefinition @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> subs = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> subs = new HashSet<>(); subs.add(new SubResourceDefinition(Resource.Type.StackConfigurationDependency)); return subs; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackLevelConfigurationResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackLevelConfigurationResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackLevelConfigurationResourceDefinition.java index 5a6ff7e..aad9cac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackLevelConfigurationResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackLevelConfigurationResourceDefinition.java @@ -46,7 +46,7 @@ public class StackLevelConfigurationResourceDefinition extends BaseResourceDefin @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> subs = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> subs = new HashSet<>(); subs.add(new SubResourceDefinition(Resource.Type.StackConfigurationDependency)); return subs; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java index 03e40c1..ee0f925 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackResourceDefinition.java @@ -46,7 +46,7 @@ public class StackResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.StackVersion)); return setChildren; } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java index 8b05423..ce9404f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackServiceResourceDefinition.java @@ -47,7 +47,7 @@ public class StackServiceResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> setChildren = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> setChildren = new HashSet<>(); setChildren.add(new SubResourceDefinition(Resource.Type.StackConfiguration)); setChildren.add(new SubResourceDefinition(Resource.Type.StackServiceComponent)); setChildren.add(new SubResourceDefinition(Type.StackArtifact)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java index 55470b9..ba102b5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/StackVersionResourceDefinition.java @@ -42,7 +42,7 @@ public class StackVersionResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - Set<SubResourceDefinition> children = new HashSet<SubResourceDefinition>(); + Set<SubResourceDefinition> children = new HashSet<>(); children.add(new SubResourceDefinition(Resource.Type.OperatingSystem)); children.add(new SubResourceDefinition(Resource.Type.StackService)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UserResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UserResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UserResourceDefinition.java index 26c1bd9..1dd6e93 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UserResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UserResourceDefinition.java @@ -43,7 +43,7 @@ public class UserResourceDefinition extends BaseResourceDefinition { @Override public Set<SubResourceDefinition> getSubResourceDefinitions() { - final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<SubResourceDefinition>(); + final Set<SubResourceDefinition> subResourceDefinitions = new HashSet<>(); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.UserPrivilege)); subResourceDefinitions.add(new SubResourceDefinition(Resource.Type.ActiveWidgetLayout)); return subResourceDefinitions;
