Merge pull request #421 from CoreMedia/JENKINS-27602

Fixed JENKINS-27602

Author: daspilker

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/GeneratedJob.java

@@ -1,11 +1,13 @@
 package javaposse.jobdsl.dsl;
 
-public class GeneratedJob implements Comparable {
+public class GeneratedJob {
     private String templateName;
     private String jobName;
 
     public GeneratedJob(String templateName, String jobName) {
-        super();
+        if (jobName == null) {
+            throw new IllegalArgumentException();
+        }
         this.templateName = templateName;
         this.jobName = jobName;
     }
@@ -18,44 +20,18 @@ public String getTemplateName() {
         return templateName;
     }
 
-    @Override
-    public int compareTo(Object o) {
-        if (o instanceof GeneratedJob) {
-            return jobName.compareTo(((GeneratedJob) o).getJobName());
-        } else {
-            return jobName.compareTo(o.toString());
-        }
-    }
-
     @Override
     public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((jobName == null) ? 0 : jobName.hashCode());
-        result = prime * result + ((templateName == null) ? 0 : templateName.hashCode());
-        return result;
+        return jobName.hashCode();
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        GeneratedJob other = (GeneratedJob) obj;
-        if (jobName == null) {
-            if (other.jobName != null)
-                return false;
-        } else if (!jobName.equals(other.jobName))
-            return false;
-        if (templateName == null) {
-            if (other.templateName != null)
-                return false;
-        } else if (!templateName.equals(other.templateName))
-            return false;
-        return true;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        GeneratedJob that = (GeneratedJob) o;
+        return jobName.equals(that.jobName);
     }
 
     @Override

job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/GeneratedView.java

@@ -1,6 +1,6 @@
 package javaposse.jobdsl.dsl;
 
-public class GeneratedView implements Comparable {
+public class GeneratedView {
     private final String name;
 
     public GeneratedView(String name) {
@@ -14,15 +14,6 @@ public String getName() {
         return name;
     }
 
-    @Override
-    public int compareTo(Object o) {
-        if (o instanceof GeneratedView) {
-            return name.compareTo(((GeneratedView) o).getName());
-        } else {
-            return name.compareTo(o.toString());
-        }
-    }
-
     @Override
     public int hashCode() {
         return name.hashCode();

job-dsl-core/src/test/groovy/javaposse/jobdsl/dsl/GeneratedViewSpec.groovy

@@ -19,20 +19,6 @@ class GeneratedViewSpec extends Specification {
         thrown(IllegalArgumentException)
     }
 
-    def 'compareTo'() {
-        when:
-        GeneratedView view = new GeneratedView('test')
-
-        then:
-        view.compareTo('test') == 0
-        view.compareTo('test2') < 0
-        view.compareTo('t') > 0
-        view.compareTo(new GeneratedView('test')) == 0
-        view.compareTo(new GeneratedView('test2')) < 0
-        view.compareTo(new GeneratedView('t')) > 0
-        view.compareTo(2) > 0
-    }
-
     def 'test equals'() {
         when:
         GeneratedView view = new GeneratedView('test')