Merge pull request #139 from alexpits/repository-equals-hashcode-fix

eyalbe4 · web-flow · commit 8ccf4a417c12 · 2017-07-05T17:53:03.000+03:00
Repository equals hashcode fix
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/BowerRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/BowerRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.BowerRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.BowerRepositorySet
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class BowerRepositorySettingsImpl extends VcsRepositorySettingsImpl implements BowerRepositorySettings {
     String bowerRegistryUrl
     Boolean externalDependenciesEnabled
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ChefRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ChefRepositorySettingsImpl.groovy
@@ -1,8 +1,10 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.ChefRepositorySettings
 
+@EqualsAndHashCode
 class ChefRepositorySettingsImpl implements ChefRepositorySettings {
 
     @Override
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/CocoaPodsRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/CocoaPodsRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.CocoaPodsRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.CocoaPodsRepositor
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class CocoaPodsRepositorySettingsImpl extends VcsRepositorySettingsImpl implements CocoaPodsRepositorySettings {
     String podsSpecsRepoUrl
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ComposerRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ComposerRepositorySettingsImpl.groovy
@@ -1,8 +1,10 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.ComposerRepositorySettings
 
+@EqualsAndHashCode
 class ComposerRepositorySettingsImpl extends VcsRepositorySettingsImpl implements ComposerRepositorySettings {
 
     String composerRegistryUrl
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ConanRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/ConanRepositorySettingsImpl.groovy
@@ -1,8 +1,10 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.ConanRepositorySettings
 
+@EqualsAndHashCode
 class ConanRepositorySettingsImpl implements ConanRepositorySettings {
 
     @Override
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/DebianRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/DebianRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.DebianRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.DebianRepositorySe
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class DebianRepositorySettingsImpl implements DebianRepositorySettings {
     Boolean debianTrivialLayout
     Boolean listRemoteFolderItems
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/DockerRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/DockerRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.DockerRepositorySettings
 import org.jfrog.artifactory.client.model.repository.settings.docker.DockerApiVersion
@@ -9,6 +10,7 @@ import org.jfrog.artifactory.client.model.repository.settings.docker.DockerApiVe
  *
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 public class DockerRepositorySettingsImpl implements DockerRepositorySettings{
     DockerApiVersion dockerApiVersion
     Boolean enableTokenAuthentication
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GemsRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GemsRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.GemsRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link GemsRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class GemsRepositorySettingsImpl implements GemsRepositorySettings {
     Boolean listRemoteFolderItems
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GenericRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GenericRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
-package org.jfrog.artifactory.client.model.repository.settings.impl;
+package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.GenericRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link GenericRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class GenericRepositorySettingsImpl implements GenericRepositorySettings {
     Boolean listRemoteFolderItems
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GitLfsRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GitLfsRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.GitLfsRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link GitLfsRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class GitLfsRepositorySettingsImpl implements GitLfsRepositorySettings {
     Boolean listRemoteFolderItems
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GradleRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/GradleRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.GradleRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link GradleRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class GradleRepositorySettingsImpl extends MavenRepositorySettingsImpl implements GradleRepositorySettings {
     @Override
     public PackageType getPackageType() {
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/IvyRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/IvyRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.IvyRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link IvyRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class IvyRepositorySettingsImpl extends MavenRepositorySettingsImpl implements IvyRepositorySettings {
     @Override
     public PackageType getPackageType() {
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/MavenRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/MavenRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.impl.LocalRepoChecksumPolicyTypeImpl
 import org.jfrog.artifactory.client.model.impl.RemoteRepoChecksumPolicyTypeImpl
@@ -12,6 +13,7 @@ import org.jfrog.artifactory.client.model.repository.settings.MavenRepositorySet
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class MavenRepositorySettingsImpl implements MavenRepositorySettings {
     Integer maxUniqueSnapshots
     Boolean handleReleases
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/NpmRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/NpmRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.NpmRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.NpmRepositorySetti
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class NpmRepositorySettingsImpl implements NpmRepositorySettings {
     Boolean listRemoteFolderItems
     Boolean externalDependenciesEnabled
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/NugetRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/NugetRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.NugetRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.NugetRepositorySet
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class NugetRepositorySettingsImpl implements NugetRepositorySettings {
     Integer maxUniqueSnapshots
     Boolean forceNugetAuthentication
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/OpkgRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/OpkgRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.OpkgRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link OpkgRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class OpkgRepositorySettingsImpl implements OpkgRepositorySettings {
     Boolean listRemoteFolderItems
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/P2RepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/P2RepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.P2RepositorySettings
 
 /**
  * GroovyBean implementation of the {@link P2RepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class P2RepositorySettingsImpl extends MavenRepositorySettingsImpl implements P2RepositorySettings {
     @Override
     public PackageType getPackageType() {
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/PuppetRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/PuppetRepositorySettingsImpl.groovy
@@ -1,8 +1,10 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.PuppetRepositorySettings
 
+@EqualsAndHashCode
 class PuppetRepositorySettingsImpl implements PuppetRepositorySettings {
 
     @Override
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/PypiRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/PypiRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.PypiRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link PypiRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class PypiRepositorySettingsImpl implements PypiRepositorySettings {
     Boolean listRemoteFolderItems
 
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/RpmRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/RpmRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.RpmRepositorySettings
 
@@ -8,6 +9,7 @@ import org.jfrog.artifactory.client.model.repository.settings.RpmRepositorySetti
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class RpmRepositorySettingsImpl implements RpmRepositorySettings {
     Integer yumRootDepth
     String groupFileNames
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/SbtRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/SbtRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.SbtRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link SbtRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class SbtRepositorySettingsImpl extends MavenRepositorySettingsImpl implements SbtRepositorySettings {
     @Override
     public PackageType getPackageType() {
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/VagrantRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/VagrantRepositorySettingsImpl.groovy
@@ -1,13 +1,15 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.VagrantRepositorySettings
 
 /**
  * GroovyBean implementation of the {@link VagrantRepositorySettings}
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
- */ 
+ */
+@EqualsAndHashCode
 class VagrantRepositorySettingsImpl implements VagrantRepositorySettings {
     @Override
     public PackageType getPackageType() {
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/VcsRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/VcsRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.VcsRepositorySettings
 import org.jfrog.artifactory.client.model.repository.settings.vcs.VcsGitProvider
@@ -10,6 +11,7 @@ import org.jfrog.artifactory.client.model.repository.settings.vcs.VcsType
  * 
  * @author Ivan Vasylivskyi (ivanvas@jfrog.com)
  */
+@EqualsAndHashCode
 class VcsRepositorySettingsImpl implements VcsRepositorySettings {
     VcsGitProvider vcsGitProvider
     VcsType vcsType
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/YumRepositorySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/repository/settings/impl/YumRepositorySettingsImpl.groovy
@@ -1,5 +1,6 @@
 package org.jfrog.artifactory.client.model.repository.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.PackageType
 import org.jfrog.artifactory.client.model.repository.settings.RpmRepositorySettings
 import org.jfrog.artifactory.client.model.repository.settings.YumRepositorySettings
@@ -11,6 +12,7 @@ import org.jfrog.artifactory.client.model.repository.settings.YumRepositorySetti
  * @deprecated since Artifactory 5.0.0. Replaced by {@link RpmRepositorySettings}.
  */
 @Deprecated
+@EqualsAndHashCode
 class YumRepositorySettingsImpl implements YumRepositorySettings {
     Integer yumRootDepth
     String groupFileNames
diff --git a/services/src/main/groovy/org/jfrog/artifactory/client/model/xray/settings/impl/XraySettingsImpl.groovy b/services/src/main/groovy/org/jfrog/artifactory/client/model/xray/settings/impl/XraySettingsImpl.groovy
@@ -1,10 +1,12 @@
 package org.jfrog.artifactory.client.model.xray.settings.impl
 
+import groovy.transform.EqualsAndHashCode
 import org.jfrog.artifactory.client.model.repository.settings.XraySettings
 
 /**
  * @author Ihor Banadiga (ihorb@jfrog.com)
  */
+@EqualsAndHashCode
 public class XraySettingsImpl implements XraySettings {
   Boolean xrayIndex;
   Boolean blockXrayUnscannedArtifacts;
diff --git a/services/src/main/java/org/jfrog/artifactory/client/model/impl/RepositoryBase.java b/services/src/main/java/org/jfrog/artifactory/client/model/impl/RepositoryBase.java
@@ -106,6 +106,8 @@ public boolean equals(Object o) {
         if (key != null ? !key.equals(that.key) : that.key != null) return false;
         if (notes != null ? !notes.equals(that.notes) : that.notes != null) return false;
         if (getRclass() != that.getRclass()) return false;
+        if (settings != null ? !settings.equals(that.settings) : that.settings != null) return false;
+        if (xraySettings != null ? !xraySettings.equals(that.xraySettings) : that.xraySettings != null) return false;
 
         return true;
     }
@@ -118,6 +120,8 @@ public int hashCode() {
         result = 31 * result + (notes != null ? notes.hashCode() : 0);
         result = 31 * result + (includesPattern != null ? includesPattern.hashCode() : 0);
         result = 31 * result + (excludesPattern != null ? excludesPattern.hashCode() : 0);
+        result = 31 * result + (settings != null ? settings.hashCode() : 0);
+        result = 31 * result + (xraySettings != null ? xraySettings.hashCode() : 0);
         return result;
     }
 
diff --git a/services/src/test/java/org/jfrog/artifactory/client/RepositoryTests.java b/services/src/test/java/org/jfrog/artifactory/client/RepositoryTests.java
