X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fmodel%2FCldsSdcServiceInfo.java;h=cf447c5c766ef667f9881567d4debdbc0a45a855;hb=9434371e811ba74364b4495120391524d5478283;hp=175dc753c9aa171a8c6813dd76e25e2141e0fe0b;hpb=08673dc040d7483e159a6e705993690538d7b117;p=clamp.git diff --git a/src/main/java/org/onap/clamp/clds/model/CldsSdcServiceInfo.java b/src/main/java/org/onap/clamp/clds/model/CldsSdcServiceInfo.java index 175dc753..cf447c5c 100644 --- a/src/main/java/org/onap/clamp/clds/model/CldsSdcServiceInfo.java +++ b/src/main/java/org/onap/clamp/clds/model/CldsSdcServiceInfo.java @@ -23,25 +23,25 @@ package org.onap.clamp.clds.model; -import java.math.BigDecimal; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; +import java.math.BigDecimal; + public class CldsSdcServiceInfo implements Comparable { - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcServiceInfo.class); + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsSdcServiceInfo.class); protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger(); - private String uuid; - private String invariantUUID; - private String name; - private String version; - private String toscaModelURL; - private String category; - private String lifecycleState; - private String lastUpdaterUserId; - private String distributionStatus; + private String uuid; + private String invariantUUID; + private String name; + private String version; + private String toscaModelURL; + private String category; + private String lifecycleState; + private String lastUpdaterUserId; + private String distributionStatus; public String getUuid() { return uuid; @@ -135,6 +135,37 @@ public class CldsSdcServiceInfo implements Comparable { return rtn; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((version == null) ? 0 : version.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CldsSdcServiceInfo other = (CldsSdcServiceInfo) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (version == null) { + if (other.version != null) + return false; + } else if (!version.equals(other.version)) + return false; + return true; + } + /** * Convert version String into a BigDecimal * @@ -147,7 +178,7 @@ public class CldsSdcServiceInfo implements Comparable { } catch (NumberFormatException nfe) { logger.warn("SDC version=" + versionText + " is not decimal for name=" + name); } - return new BigDecimal(0.0); + return BigDecimal.valueOf(0.0); } }