X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Faaf%2FAafNamespace.java;h=b5a887c074352296ae28051f5b417dfe37807c12;hb=5a9cbe16fa36ba35dc9ba104a287977e975a455b;hp=793260c0697bde197ca554f9138e9f0ca133ba19;hpb=94342e5bf61ff9f99347d0962b61c7ec2c177949;p=dmaap%2Fdbcapi.git diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafNamespace.java b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafNamespace.java index 793260c..b5a887c 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafNamespace.java +++ b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafNamespace.java @@ -8,9 +8,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,30 +21,31 @@ package org.onap.dmaap.dbcapi.aaf; -import java.util.ArrayList; - import org.apache.log4j.Logger; import org.onap.dmaap.dbcapi.util.DmaapConfig; +import java.util.ArrayList; +import java.util.Objects; + public class AafNamespace extends AafObject { private static final Logger logger = Logger.getLogger(AafNamespace.class); - + private String name; private ArrayList admin; private ArrayList responsible; - + // in some environments, an AAF Namespace must be owned by a human. // So, when needed, this var can be set via a property private static String NsOwnerIdentity; - + public AafNamespace(String ns, String identity ) { super(); DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig(); NsOwnerIdentity = p.getProperty( "aaf.NsOwnerIdentity", ""); this.admin = new ArrayList<>(); this.responsible = new ArrayList<>(); - + this.name = ns; this.admin.add( identity ); this.responsible.add( NsOwnerIdentity ); @@ -87,7 +88,7 @@ public class AafNamespace extends AafObject { public String toJSON() { - String postJSON = String.format(" { \"name\": \"%s\", \"admin\": [", + String postJSON = String.format(" { \"name\": \"%s\", \"admin\": [", this.getName() ); postJSON += separatedList( this.getAdmin(), "," ); @@ -95,11 +96,22 @@ public class AafNamespace extends AafObject { postJSON += separatedList( this.getResponsible(), ","); postJSON += "]}"; logger.info( "returning JSON: " + postJSON); - + return postJSON; } - - - - + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + AafNamespace that = (AafNamespace) o; + return Objects.equals(name, that.name) && + Objects.equals(admin, that.admin) && + Objects.equals(responsible, that.responsible); + } + + @Override + public int hashCode() { + return Objects.hash(name, admin, responsible); + } }