Merge pull request #147 from Praqma/java8_lambdas

Java8 lambdas

Author: oleg-nenashev

src/main/java/hudson/plugins/promoted_builds/JobPropertyImpl.java

@@ -141,21 +141,13 @@ private JobPropertyImpl(StaplerRequest req, JSONObject json) throws Descriptor.F
     }
 
     private void loadAllProcesses(File rootDir) throws IOException {
-        File[] subdirs = rootDir.listFiles(new FileFilter() {
-            public boolean accept(File child) {
-                return child.isDirectory();
-            }
-        });
+        File[] subdirs = rootDir.listFiles(File::isDirectory);
 
         loadProcesses(subdirs);
     }
     private void init() throws IOException {
         // load inactive processes
-        File[] subdirs = getRootDir().listFiles(new FileFilter() {
-            public boolean accept(File child) {
-                return child.isDirectory() && !isActiveProcessNameIgnoreCase(child.getName());
-            }
-        });
+        File[] subdirs = getRootDir().listFiles(child -> child.isDirectory() && !isActiveProcessNameIgnoreCase(child.getName()));
         loadProcesses(subdirs);
     }
     private void loadProcesses(File[] subdirs) throws IOException {

src/main/java/hudson/plugins/promoted_builds/PromotionCause.java

@@ -5,6 +5,8 @@
 import hudson.model.TaskListener;
 import hudson.console.HyperlinkNote;
 
+import java.util.Objects;
+
 /**
  * Cause used to indicate that a build was triggered by a promotion.  Extends
  * UpstreamCause so that existing build steps can use "the upstream build that
@@ -76,10 +78,10 @@ public boolean equals(Object obj) {
             return false;
         }
         final PromotionCause other = (PromotionCause) obj;
-        if ((this.promotionProcessName == null) ? (other.promotionProcessName != null) : !this.promotionProcessName.equals(other.promotionProcessName)) {
+        if (!Objects.equals(this.promotionProcessName, other.promotionProcessName)) {
             return false;
         }
-        if ((this.promotionBuildUrl == null) ? (other.promotionBuildUrl != null) : !this.promotionBuildUrl.equals(other.promotionBuildUrl)) {
+        if (!Objects.equals(this.promotionBuildUrl, other.promotionBuildUrl)) {
             return false;
         }
         if (this.promotionBuildNumber != other.promotionBuildNumber) {

src/main/java/hudson/plugins/promoted_builds/PromotionProcess.java

@@ -309,10 +309,7 @@ public boolean isVisible(){
     	if (expandedIsVisible == null){
     		return true;
     	}
-    	if (expandedIsVisible.toLowerCase().equals("false")){
-    		return false;
-    	}
-    	return true;
+       return !expandedIsVisible.toLowerCase().equals("false");
     }
     private static EnvVars getDefaultParameterValuesAsEnvVars(AbstractProject owner) {
     	EnvVars envVars = null;

src/test/java/hudson/plugins/promoted_builds/KeepBuildForeverActionTest.java

@@ -111,23 +111,19 @@ public void testDoesNotMarkBuildIfBuildNotPromotion() throws Exception {
     }
 
     private void waitForBuild(final Job job, final int buildNumber) throws Exception {
-        waitFor(new WaitCondition() {
-            public boolean isMet() {
-                return (job.getBuildByNumber(buildNumber) != null) && !job.getBuildByNumber(buildNumber).isBuilding();
-            }
+        waitFor(() -> {
+            return (job.getBuildByNumber(buildNumber) != null) && !job.getBuildByNumber(buildNumber).isBuilding();
         }, 2000);
     }
 
     private void waitFor(final WaitCondition condition, long timeout) throws Exception {
-        Thread waiter = new Thread() {
-            public void run() {
-                try {
-                    while (!condition.isMet()) {
-                        Thread.sleep(100);
-                    }
-                } catch (InterruptedException ie) { }
-            }
-        };
+        Thread waiter = new Thread(() -> {
+            try {
+                while (!condition.isMet()) {
+                    Thread.sleep(100);
+                }
+            } catch (InterruptedException ie) { }
+        });
         waiter.start();
         waiter.join(timeout);
         if (waiter.isAlive()) {

src/test/java/hudson/plugins/promoted_builds/PromotionProcessTest.java

@@ -150,24 +150,22 @@ private void waitForCompletion(FreeStyleProject down, int n) throws Exception {
 
     @Test
     public void testCaptureXml() throws Exception {
-        j.executeOnServer(new Callable<Object>() {
-            public Object call() throws Exception {
-                JSONObject o = new JSONObject()
-                        .accumulate("name", "foo")
-                        .accumulate("isVisible", "")
-                        .accumulate("icon", "star-gold")
-                        .accumulate("conditions",new JSONObject()
-                            .accumulate("hudson-plugins-promoted_builds-conditions-SelfPromotionCondition",
-                                    new JSONObject().accumulate("evenIfUnstable", false)));
-                PromotionProcess p = PromotionProcess.fromJson(Stapler.getCurrentRequest(), o);
-                assertEquals("foo", p.getName());
-                assertEquals("star-gold", p.getIcon());
-                assertEquals(1, p.conditions.size());
-                assertEquals(0, p.getBuildWrappers().size());
-                assertNotNull(p.conditions.get(SelfPromotionCondition.class));
-                System.out.println(Items.XSTREAM2.toXML(p));
-                return null;
-            }
+        j.executeOnServer(() -> {
+            JSONObject o = new JSONObject()
+                    .accumulate("name", "foo")
+                    .accumulate("isVisible", "")
+                    .accumulate("icon", "star-gold")
+                    .accumulate("conditions",new JSONObject()
+                        .accumulate("hudson-plugins-promoted_builds-conditions-SelfPromotionCondition",
+                                new JSONObject().accumulate("evenIfUnstable", false)));
+            PromotionProcess p = PromotionProcess.fromJson(Stapler.getCurrentRequest(), o);
+            assertEquals("foo", p.getName());
+            assertEquals("star-gold", p.getIcon());
+            assertEquals(1, p.conditions.size());
+            assertEquals(0, p.getBuildWrappers().size());
+            assertNotNull(p.conditions.get(SelfPromotionCondition.class));
+            System.out.println(Items.XSTREAM2.toXML(p));
+            return null;
         });
     }