Le serveur gitlab sera inaccessible le mercredi 19 février 2020 de 13h à 14h pour une intervention de maintenance programmée.

Commit be962ea4 authored by Dominique Marcadet's avatar Dominique Marcadet

revert to full attribute use for hashCode() and equals()

default values should be present for missing values
parent 13c6c2e6
......@@ -30,7 +30,6 @@ public class NsIdentification {
private Integer release;
public NsIdentification( String id, Integer version, String revision, Integer release ) {
super();
this.id = id;
this.version = version;
this.revision = revision;
......@@ -38,17 +37,31 @@ public class NsIdentification {
}
public NsIdentification( AgNSIdentification identification ) {
super();
this.id = identification.getId();
this.version = identification.getVersion();
this.revision = identification.getRevision();
this.release = identification.getRelease();
}
public String getId() {
return id;
}
public Integer getVersion() {
return version;
}
public String getRevision() {
return revision;
}
public Integer getRelease() {
return release;
}
@Override
public int hashCode() {
// Only id and version are required, revision and release are optional
return Objects.hash( id, version );
return Objects.hash( id, release, revision, version );
}
@Override
......@@ -57,15 +70,13 @@ public class NsIdentification {
if( obj == null ) return false;
if( getClass() != obj.getClass() ) return false;
NsIdentification other = ( NsIdentification ) obj;
return Objects.equals( id, other.id ) && Objects.equals( version, other.version );
return Objects.equals( id, other.id ) && Objects.equals( release, other.release )
&& Objects.equals( revision, other.revision ) && Objects.equals( version, other.version );
}
@Override
public String toString() {
return "NsIdentification [" + ( id != null ? "id=" + id + ", " : "" )
+ ( version != null ? "version=" + version + ", " : "" )
+ ( revision != null ? "revision=" + revision + ", " : "" )
+ ( release != null ? "release=" + release : "" ) + "]";
return "NsIdentification [id=" + id + ", version=" + version + ", revision=" + revision + ", release=" + release + "]";
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment