DCAE-18: Merge feature/onap branch from CodeCloud

Change-Id: I2339bede7a93c5579e46b302972e833f1f3c7d5a
Signed-off-by: ATT default cloud user <dgl@research.att.com>

1 files changed, 27 insertions, 7 deletions

diff --git a/src/main/java/org/openecomp/dmaapbc/model/Feed.java b/src/main/java/org/openecomp/dmaapbc/model/Feed.java
index c445b65..5d89331 100644
--- a/src/main/java/org/openecomp/dmaapbc/model/Feed.java
+++ b/src/main/java/org/openecomp/dmaapbc/model/Feed.java
@@ -23,21 +23,14 @@ package org.openecomp.dmaapbc.model;
 import java.nio.charset.StandardCharsets;

 import java.util.ArrayList;

 

-import javax.xml.bind.annotation.XmlElement;

 import javax.xml.bind.annotation.XmlRootElement;

 

-import org.apache.log4j.Logger;

-

-

 import org.json.simple.*;

 import org.json.simple.parser.*;

 import org.openecomp.dmaapbc.service.DmaapService;

-import org.openecomp.dmaapbc.util.RandomString;

 

 @XmlRootElement

 public class Feed extends DmaapObject {

-	static final Logger logger = Logger.getLogger(Feed.class);

-

 		

 		private String feedId;

 

@@ -276,4 +269,31 @@ public class Feed extends DmaapObject {
 			return ret;

 		}

 

+		@Override

+		public String toString() {

+			String rc = String.format ( "Feed: {feedId=%s feedName=%s feedVersion=%s feedDescription=%s owner=%s asprClassification=%s publishURL=%s subscriberURL=%s suspended=%s logURL=%s formatUuid=%s}",

+					feedId,

+					feedName,

+					feedVersion,

+					feedDescription,

+					owner,

+					asprClassification,

+					publishURL,

+					subscribeURL,

+					suspended,

+					logURL,

+					formatUuid

+

+		

+					);

+

+			for( DR_Pub pub: pubs) {

+				rc += "\n" + pub.toString();

+			}

+

+			for( DR_Sub sub: subs ) {

+				rc += "\n" + sub.toString();

+			}

+			return rc;

+		}

 }