Add parent params to Resource equals/hashcode/toString

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## VERSION 0.0.4-SNAPSHOT
 ### Features Added:
-* N/A
+* Hascode and Object.equals functions now factor in all parameters of parent class (not just local members)
 
 ### Bugs Resolved:
 * N/A

octopus-sdk/src/main/java/com/octopus/sdk/model/BaseResource.java

@@ -34,6 +34,9 @@ public String getId() {
   }
 
   public ImmutableMap<String, String> getLinks() {
+    if (links == null) {
+      return ImmutableMap.of();
+    }
     return ImmutableMap.copyOf(links);
   }
 

octopus-sdk/src/main/java/com/octopus/sdk/model/apikey/ApiKeyResource.java

@@ -160,12 +160,23 @@ public boolean equals(Object o) {
         && Objects.equals(this.lastModifiedBy, apiKeyResource.lastModifiedBy)
         && Objects.equals(this.lastModifiedOn, apiKeyResource.lastModifiedOn)
         && Objects.equals(this.purpose, apiKeyResource.purpose)
-        && Objects.equals(this.userId, apiKeyResource.userId);
+        && Objects.equals(this.userId, apiKeyResource.userId)
+        && Objects.equals(this.getId(), apiKeyResource.getId())
+        && Objects.equals(this.getLinks(), apiKeyResource.getLinks());
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(apiKey, created, expires, lastModifiedBy, lastModifiedOn, purpose, userId);
+    return Objects.hash(
+        apiKey,
+        created,
+        expires,
+        lastModifiedBy,
+        lastModifiedOn,
+        purpose,
+        userId,
+        getId(),
+        getLinks());
   }
 
   @Override
@@ -179,6 +190,8 @@ public String toString() {
     sb.append("    lastModifiedOn: ").append(toIndentedString(lastModifiedOn)).append("\n");
     sb.append("    purpose: ").append(toIndentedString(purpose)).append("\n");
     sb.append("    userId: ").append(toIndentedString(userId)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/buildinformation/BuildInformationResource.java

@@ -324,7 +324,9 @@ public boolean equals(Object o) {
         && Objects.equals(this.vcsCommitUrl, buildInformationResource.vcsCommitUrl)
         && Objects.equals(this.vcsRoot, buildInformationResource.vcsRoot)
         && Objects.equals(this.vcsType, buildInformationResource.vcsType)
-        && Objects.equals(this.workItems, buildInformationResource.workItems);
+        && Objects.equals(this.workItems, buildInformationResource.workItems)
+        && Objects.equals(this.getId(), buildInformationResource.getId())
+        && Objects.equals(this.getLinks(), buildInformationResource.getLinks());
   }
 
   @Override
@@ -344,7 +346,9 @@ public int hashCode() {
         vcsCommitUrl,
         vcsRoot,
         vcsType,
-        workItems);
+        workItems,
+        getId(),
+        getLinks());
   }
 
   @Override
@@ -368,6 +372,8 @@ public String toString() {
     sb.append("    vcsRoot: ").append(toIndentedString(vcsRoot)).append("\n");
     sb.append("    vcsType: ").append(toIndentedString(vcsType)).append("\n");
     sb.append("    workItems: ").append(toIndentedString(workItems)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/buildinformation/OctopusPackageVersionBuildInformationMappedResource.java

@@ -384,7 +384,10 @@ public boolean equals(Object o) {
         && Objects.equals(this.vcsType, octopusPackageVersionBuildInformationMappedResource.vcsType)
         && Objects.equals(this.version, octopusPackageVersionBuildInformationMappedResource.version)
         && Objects.equals(
-            this.workItems, octopusPackageVersionBuildInformationMappedResource.workItems);
+            this.workItems, octopusPackageVersionBuildInformationMappedResource.workItems)
+        && Objects.equals(this.getId(), octopusPackageVersionBuildInformationMappedResource.getId())
+        && Objects.equals(
+            this.getLinks(), octopusPackageVersionBuildInformationMappedResource.getLinks());
   }
 
   @Override
@@ -406,7 +409,9 @@ public int hashCode() {
         vcsRoot,
         vcsType,
         version,
-        workItems);
+        workItems,
+        getId(),
+        getLinks());
   }
 
   @Override
@@ -432,6 +437,8 @@ public String toString() {
     sb.append("    vcsType: ").append(toIndentedString(vcsType)).append("\n");
     sb.append("    version: ").append(toIndentedString(version)).append("\n");
     sb.append("    workItems: ").append(toIndentedString(workItems)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/channel/ChannelResource.java

@@ -204,7 +204,11 @@ public boolean equals(Object o) {
         && Objects.equals(this.projectId, channelResource.projectId)
         && Objects.equals(this.rules, channelResource.rules)
         && Objects.equals(this.spaceId, channelResource.spaceId)
-        && Objects.equals(this.tenantTags, channelResource.tenantTags);
+        && Objects.equals(this.tenantTags, channelResource.tenantTags)
+        && Objects.equals(this.getId(), channelResource.getId())
+        && Objects.equals(this.getName(), channelResource.getName())
+        && Objects.equals(this.getLinks(), channelResource.getLinks())
+        && Objects.equals(this.getDescription(), channelResource.getDescription());
   }
 
   @Override
@@ -217,7 +221,11 @@ public int hashCode() {
         projectId,
         rules,
         spaceId,
-        tenantTags);
+        tenantTags,
+        getId(),
+        getName(),
+        getDescription(),
+        getLinks());
   }
 
   @Override
@@ -232,6 +240,10 @@ public String toString() {
     sb.append("    rules: ").append(toIndentedString(rules)).append("\n");
     sb.append("    spaceId: ").append(toIndentedString(spaceId)).append("\n");
     sb.append("    tenantTags: ").append(toIndentedString(tenantTags)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    name: ").append(toIndentedString(this.getName())).append("\n");
+    sb.append("    description: ").append(toIndentedString(this.getDescription())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/deployment/DeploymentResource.java

@@ -617,7 +617,11 @@ public boolean equals(Object o) {
         && Objects.equals(this.taskId, deploymentResource.taskId)
         && Objects.equals(this.tenantId, deploymentResource.tenantId)
         && Objects.equals(this.tentacleRetentionPeriod, deploymentResource.tentacleRetentionPeriod)
-        && Objects.equals(this.useGuidedFailure, deploymentResource.useGuidedFailure);
+        && Objects.equals(this.useGuidedFailure, deploymentResource.useGuidedFailure)
+        && Objects.equals(this.getId(), deploymentResource.getId())
+        && Objects.equals(this.getName(), deploymentResource.getName())
+        && Objects.equals(this.getLinks(), deploymentResource.getLinks())
+        && Objects.equals(this.getDescription(), deploymentResource.getDescription());
   }
 
   @Override
@@ -651,7 +655,11 @@ public int hashCode() {
         taskId,
         tenantId,
         tentacleRetentionPeriod,
-        useGuidedFailure);
+        useGuidedFailure,
+        getId(),
+        getName(),
+        getDescription(),
+        getLinks());
   }
 
   @Override
@@ -699,6 +707,10 @@ public String toString() {
         .append(toIndentedString(tentacleRetentionPeriod))
         .append("\n");
     sb.append("    useGuidedFailure: ").append(toIndentedString(useGuidedFailure)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    name: ").append(toIndentedString(this.getName())).append("\n");
+    sb.append("    description: ").append(toIndentedString(this.getDescription())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/environment/EnvironmentResource.java

@@ -156,7 +156,11 @@ public boolean equals(Object o) {
         && Objects.equals(this.lastModifiedOn, environmentResource.lastModifiedOn)
         && Objects.equals(this.sortOrder, environmentResource.sortOrder)
         && Objects.equals(this.spaceId, environmentResource.spaceId)
-        && Objects.equals(this.useGuidedFailure, environmentResource.useGuidedFailure);
+        && Objects.equals(this.useGuidedFailure, environmentResource.useGuidedFailure)
+        && Objects.equals(this.getId(), environmentResource.getId())
+        && Objects.equals(this.getName(), environmentResource.getName())
+        && Objects.equals(this.getLinks(), environmentResource.getLinks())
+        && Objects.equals(this.getDescription(), environmentResource.getDescription());
   }
 
   @Override
@@ -168,7 +172,11 @@ public int hashCode() {
         lastModifiedOn,
         sortOrder,
         spaceId,
-        useGuidedFailure);
+        useGuidedFailure,
+        getId(),
+        getName(),
+        getDescription(),
+        getLinks());
   }
 
   @Override
@@ -184,6 +192,10 @@ public String toString() {
     sb.append("    sortOrder: ").append(toIndentedString(sortOrder)).append("\n");
     sb.append("    spaceId: ").append(toIndentedString(spaceId)).append("\n");
     sb.append("    useGuidedFailure: ").append(toIndentedString(useGuidedFailure)).append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    name: ").append(toIndentedString(this.getName())).append("\n");
+    sb.append("    description: ").append(toIndentedString(this.getDescription())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/lifecycle/LifecycleResource.java

@@ -137,7 +137,11 @@ public boolean equals(Object o) {
         && Objects.equals(this.phases, lifecycleResource.phases)
         && Objects.equals(this.releaseRetentionPolicy, lifecycleResource.releaseRetentionPolicy)
         && Objects.equals(this.spaceId, lifecycleResource.spaceId)
-        && Objects.equals(this.tentacleRetentionPolicy, lifecycleResource.tentacleRetentionPolicy);
+        && Objects.equals(this.tentacleRetentionPolicy, lifecycleResource.tentacleRetentionPolicy)
+        && Objects.equals(this.getId(), lifecycleResource.getId())
+        && Objects.equals(this.getName(), lifecycleResource.getName())
+        && Objects.equals(this.getLinks(), lifecycleResource.getLinks())
+        && Objects.equals(this.getDescription(), lifecycleResource.getDescription());
   }
 
   @Override
@@ -148,7 +152,11 @@ public int hashCode() {
         phases,
         releaseRetentionPolicy,
         spaceId,
-        tentacleRetentionPolicy);
+        tentacleRetentionPolicy,
+        getId(),
+        getName(),
+        getDescription(),
+        getLinks());
   }
 
   @Override
@@ -165,6 +173,10 @@ public String toString() {
     sb.append("    tentacleRetentionPolicy: ")
         .append(toIndentedString(tentacleRetentionPolicy))
         .append("\n");
+    sb.append("    id: ").append(toIndentedString(this.getId())).append("\n");
+    sb.append("    name: ").append(toIndentedString(this.getName())).append("\n");
+    sb.append("    description: ").append(toIndentedString(this.getDescription())).append("\n");
+    sb.append("    links: ").append(toIndentedString(this.getLinks())).append("\n");
     sb.append("}");
     return sb.toString();
   }

octopus-sdk/src/main/java/com/octopus/sdk/model/packages/PackageResource.java

@@ -289,7 +289,9 @@ public boolean equals(Object o) {
         && Objects.equals(this.releaseNotes, packageResource.releaseNotes)
         && Objects.equals(this.summary, packageResource.summary)
         && Objects.equals(this.title, packageResource.title)
-        && Objects.equals(this.version, packageResource.version);
+        && Objects.equals(this.version, packageResource.version)
+        && Objects.equals(this.getId(), packageResource.getId())
+        && Objects.equals(this.getLinks(), packageResource.getLinks());
   }
 
   @Override