small fixes and refactor

Author: Ian-Nara

src/main/java/com/uid2/shared/model/Service.java

@@ -37,6 +37,10 @@ public int getSiteId() {
         return siteId;
     }
 
+    public void setSiteId(int siteId) {
+        this.siteId = siteId;
+    }
+
     public String getLinkIdRegex() {
         return linkIdRegex;
     }
@@ -45,10 +49,6 @@ public void setLinkIdRegex(String linkIdRegex) {
         this.linkIdRegex = linkIdRegex;
     }
 
-    public void setSiteId(int siteId) {
-        this.siteId = siteId;
-    }
-
     public String getName() {
         return name;
     }
@@ -79,14 +79,14 @@ public String toString() {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Service service = (Service) o;
-        boolean compare = serviceId == service.serviceId && siteId == service.siteId && name.equals(service.name) && roles.equals(service.roles);
-        if (linkIdRegex == null || service.linkIdRegex == null) {
-            return compare && linkIdRegex == service.linkIdRegex;
-        }
-
-        return compare && linkIdRegex.equals(service.linkIdRegex);
+        if (!(o instanceof Service)) return false;
+        Service other = (Service) o;
+
+        return serviceId == other.serviceId
+            && siteId == other.siteId
+            && Objects.equals(name,       other.name)
+            && Objects.equals(roles,      other.roles)
+            && Objects.equals(linkIdRegex, other.linkIdRegex);
     }
 
     @Override