From 713b4ea17facb7b23016b875e382f1198d223c58 Mon Sep 17 00:00:00 2001 From: ayman abdelghany Date: Thu, 18 Feb 2016 02:48:00 +0200 Subject: [PATCH] "entrySet()" should be iterated when both the key and value are needed --- .../buildverification/JenkinsVerifier.java | 4 +- .../common/VerigreenNeededLogic.java | 37 ++++++++++--------- .../collector/jobs/BranchCleanerJob.java | 4 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java index 015ecb0..57d0cf4 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/buildverification/JenkinsVerifier.java @@ -110,9 +110,9 @@ public static void triggerJob(CommitItem commitItem) { CollectorApi.getCommitItemContainer().save(commitItem); ImmutableMap.Builder finalJenkinsParams = ImmutableMap.builder().put("token",VerigreenNeededLogic.properties.getProperty("jenkins.password")); finalJenkinsParams.put(CollectorApi.getBranchParamName(), branchName); - for(String key : commitParams.keySet()) + for(Map.Entry entry : commitParams.entrySet()) { - finalJenkinsParams.put(key,commitParams.get(key)); + finalJenkinsParams.put(entry.getKey(),entry.getValue()); } final ImmutableMap params = finalJenkinsParams.build(); job2Verify.build(params); diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java index a9f2355..4c64d4f 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/common/VerigreenNeededLogic.java @@ -326,8 +326,8 @@ public static Map checkJenkinsMode(CommitItem commitItem) { if(jenkinsParams.get("jenkinsparam.mode") != null && jenkinsParams.get("jenkinsparam.mode").equals("json")){ JsonObject json = new JsonObject(); - for(String key : paramMap.keySet()){ - json.addProperty(key, paramMap.get(key)); + for(Map.Entry entry: paramMap.entrySet()){ + json.addProperty(entry.getKey(), entry.getValue()); } resultMap.put("json",json.toString()); } @@ -346,47 +346,48 @@ public static Map checkJenkinsMode(CommitItem commitItem) { public static Map commitItemAsParameterMap(CommitItem commitItem) { Map returnedForJenkins = new HashMap(); - for(String key : jenkinsParams.keySet()) + for(Map.Entry entry : jenkinsParams.entrySet()) { + String key = entry.getKey(); if(key.contains("commitid")){ - if (jenkinsParams.get(key).equals("true")){ + if (entry.getValue().equals("true")){ returnedForJenkins.put("commitid",commitItem.getBranchDescriptor().getNewBranch()); } - else if (!jenkinsParams.get(key).equals("false")){ - returnedForJenkins.put(jenkinsParams.get(key), commitItem.getBranchDescriptor().getNewBranch()); + else if (!entry.getValue().equals("false")){ + returnedForJenkins.put(entry.getValue(), commitItem.getBranchDescriptor().getNewBranch()); } } else if(key.contains("committer")){ - if (jenkinsParams.get(key).equals("true")){ + if (entry.getValue().equals("true")){ returnedForJenkins.put("committer",commitItem.getBranchDescriptor().getCommitter()); } - else if (!jenkinsParams.get(key).equals("false")){ - returnedForJenkins.put(jenkinsParams.get(key), commitItem.getBranchDescriptor().getCommitter()); + else if (!entry.getValue().equals("false")){ + returnedForJenkins.put(entry.getValue(), commitItem.getBranchDescriptor().getCommitter()); } } else if(key.contains("longid")){ - if (jenkinsParams.get(key).equals("true")){ + if (entry.getValue().equals("true")){ returnedForJenkins.put("longid",commitItem.getBranchDescriptor().getCommitId()); } - else if (!jenkinsParams.get(key).equals("false")){ - returnedForJenkins.put(jenkinsParams.get(key),commitItem.getBranchDescriptor().getCommitId()); + else if (!entry.getValue().equals("false")){ + returnedForJenkins.put(entry.getValue(),commitItem.getBranchDescriptor().getCommitId()); } } else if(key.contains("jenkinsparam.protected")){ - if(jenkinsParams.get(key).equals("true")){ + if(entry.getValue().equals("true")){ returnedForJenkins.put("protected",commitItem.getBranchDescriptor().getProtectedBranch()); } - else if (!jenkinsParams.get(key).equals("false")){ - returnedForJenkins.put(jenkinsParams.get(key), commitItem.getBranchDescriptor().getProtectedBranch()); + else if (!entry.getValue().equals("false")){ + returnedForJenkins.put(entry.getValue(), commitItem.getBranchDescriptor().getProtectedBranch()); } } else if(key.contains("parent")){ String paraent = commitItem.getParent() == null?commitItem.getBranchDescriptor().getProtectedBranch():commitItem.getParent().getBranchDescriptor().getNewBranch(); - if(jenkinsParams.get(key).equals("true")){ + if(entry.getValue().equals("true")){ returnedForJenkins.put("parent",paraent); } - else if (!jenkinsParams.get(key).equals("false")){ - returnedForJenkins.put(jenkinsParams.get(key), paraent); + else if (!entry.getValue().equals("false")){ + returnedForJenkins.put(entry.getValue(), paraent); } } } diff --git a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java index dbc9d4a..386186e 100644 --- a/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java +++ b/verigreen-collector-impl/src/main/java/com/verigreen/collector/jobs/BranchCleanerJob.java @@ -84,8 +84,8 @@ else if(!branchesMap.get(branch.subSequence(0, 10)).contains(branch)){ branchesMap.remove(branch.getBranchDescriptor().getNewBranch().subSequence(0, 10)); } } - for(String key : branchesMap.keySet()) { - result.addAll(branchesMap.get(key)); + for(Map.Entry> entry : branchesMap.entrySet()) { + result.addAll(entry.getValue()); } try {