[NO ISSUE][HYR][*DB] Minor refactoring / address SonarQube comments
Change-Id: Icf10b6df0fdc006675d8f0da6fd06d50200c6b6a
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2098
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Murtadha Hubail <mhubail@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
index d13b5e6..67738ba 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
@@ -344,20 +344,20 @@
private void applyDefaults() {
LOGGER.fine("applying defaults");
- for (Map.Entry<Section, Map<String, IOption>> entry : sectionMap.entrySet()) {
- if (entry.getKey() == Section.NC) {
- entry.getValue().values().forEach(option -> getNodeNames()
+ sectionMap.forEach((key, value) -> {
+ if (key == Section.NC) {
+ value.values().forEach(option -> getNodeNames()
.forEach(node -> getOrDefault(getNodeEffectiveMap(node), option, node)));
for (Map.Entry<String, Map<IOption, Object>> nodeMap : nodeSpecificMap.entrySet()) {
- entry.getValue().values()
+ value.values()
.forEach(option -> getOrDefault(
new CompositeMap<>(nodeMap.getValue(), definedMap, new NoOpMapMutator()), option,
nodeMap.getKey()));
}
} else {
- entry.getValue().values().forEach(option -> getOrDefault(configurationMap, option, null));
+ value.values().forEach(option -> getOrDefault(configurationMap, option, null));
}
- }
+ });
}
private Object getOrDefault(Map<IOption, Object> map, IOption option, String nodeId) {
@@ -450,15 +450,13 @@
public Ini toIni(boolean includeDefaults) {
Ini ini = new Ini();
- for (Map.Entry<IOption, Object> entry : (includeDefaults ? configurationMap : definedMap).entrySet()) {
- if (entry.getValue() != null) {
- final IOption option = entry.getKey();
- ini.add(option.section().sectionName(), option.ini(), option.type().serializeToIni(entry.getValue()));
+ (includeDefaults ? configurationMap : definedMap).forEach((option, value) -> {
+ if (value != null) {
+ ini.add(option.section().sectionName(), option.ini(), option.type().serializeToIni(value));
}
- }
- for (Map.Entry<String, Map<IOption, Object>> nodeMapEntry : nodeSpecificMap.entrySet()) {
- String section = Section.NC.sectionName() + "/" + nodeMapEntry.getKey();
- final Map<IOption, Object> nodeValueMap = nodeMapEntry.getValue();
+ });
+ nodeSpecificMap.forEach((key, nodeValueMap) -> {
+ String section = Section.NC.sectionName() + "/" + key;
synchronized (nodeValueMap) {
for (Map.Entry<IOption, Object> entry : nodeValueMap.entrySet()) {
if (entry.getValue() != null) {
@@ -467,7 +465,7 @@
}
}
}
- }
+ });
return ini;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java
index d1d33a5..90dfc8c 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/AbstractProfile.java
@@ -26,19 +26,19 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.hyracks.api.io.IWritable;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.hyracks.api.io.IWritable;
-
public abstract class AbstractProfile implements IWritable, Serializable {
private static final long serialVersionUID = 1L;
protected Map<String, Long> counters;
public AbstractProfile() {
- counters = new HashMap<String, Long>();
+ counters = new HashMap<>();
}
public Map<String, Long> getCounters() {
@@ -50,12 +50,12 @@
protected void populateCounters(ObjectNode jo) {
ObjectMapper om = new ObjectMapper();
ArrayNode countersObj = om.createArrayNode();
- for (Map.Entry<String, Long> e : counters.entrySet()) {
+ counters.forEach((key, value) -> {
ObjectNode jpe = om.createObjectNode();
- jpe.put("name", e.getKey());
- jpe.put("value", e.getValue());
+ jpe.put("name", key);
+ jpe.put("value", value);
countersObj.add(jpe);
- }
+ });
jo.set("counters", countersObj);
}
@@ -75,7 +75,7 @@
@Override
public void readFields(DataInput input) throws IOException {
int size = input.readInt();
- counters = new HashMap<String, Long>();
+ counters = new HashMap<>();
for (int i = 0; i < size; i++) {
String key = input.readUTF();
long value = input.readLong();
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java
index 79a5538..64d074b 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobProfile.java
@@ -25,10 +25,11 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.hyracks.api.job.JobId;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.hyracks.api.job.JobId;
public class JobProfile extends AbstractProfile {
private static final long serialVersionUID = 1L;
@@ -49,7 +50,7 @@
public JobProfile(JobId jobId) {
this.jobId = jobId;
- jobletProfiles = new HashMap<String, JobletProfile>();
+ jobletProfiles = new HashMap<>();
}
public JobId getJobId() {
@@ -91,7 +92,7 @@
public void readFields(DataInput input) throws IOException {
jobId = JobId.create(input);
int size = input.readInt();
- jobletProfiles = new HashMap<String, JobletProfile>();
+ jobletProfiles = new HashMap<>();
for (int i = 0; i < size; i++) {
String key = input.readUTF();
JobletProfile value = JobletProfile.create(input);
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java
index c3792df..5bdb1b5 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/job/profiling/om/JobletProfile.java
@@ -25,11 +25,11 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.hyracks.api.dataflow.TaskAttemptId;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.apache.hyracks.api.dataflow.TaskAttemptId;
public class JobletProfile extends AbstractProfile {
private static final long serialVersionUID = 1L;
@@ -50,7 +50,7 @@
public JobletProfile(String nodeId) {
this.nodeId = nodeId;
- taskProfiles = new HashMap<TaskAttemptId, TaskProfile>();
+ taskProfiles = new HashMap<>();
}
public String getNodeId() {
@@ -67,7 +67,7 @@
ObjectMapper om = new ObjectMapper();
ObjectNode json = om.createObjectNode();
- json.put("node-id", nodeId.toString());
+ json.put("node-id", nodeId);
populateCounters(json);
ArrayNode tasks = om.createArrayNode();
for (TaskProfile p : taskProfiles.values()) {
@@ -94,7 +94,7 @@
super.readFields(input);
nodeId = input.readUTF();
int size = input.readInt();
- taskProfiles = new HashMap<TaskAttemptId, TaskProfile>();
+ taskProfiles = new HashMap<>();
for (int i = 0; i < size; i++) {
TaskAttemptId key = TaskAttemptId.create(input);
TaskProfile value = TaskProfile.create(input);